merge of cherry-pick of c7ce43e (CURA-522)
merge of cherry-pick of c7ce43e (CURA-522)

totalretribution/CuraEngine,alephobjects/CuraEngine,totalretribution/CuraEngine,ROBO3D/CuraEngine,Ultimaker/CuraEngine,ROBO3D/CuraEngine,Ultimaker/CuraEngine,totalretribution/CuraEngine,ROBO3D/CuraEngine,alephobjects/CuraEngine,alephobjects/CuraEngine