Cherry pick INTEGRATED-941 for 0.6
was added to 0.4.1 and should be added to 0.6 as well
Note: 0.4.1 has some custom changes, to a simple merge is not possible
January 5, 2017, 1:04 PM
.Schatting van 2.5 uur is geaccepteerd door Integrated Marijn (in opdracht ingevoerd door Marijn Otte).