Fixing https://github.com/daid/Cura/issues/820
Merge branch 'master' of github.com:Ultimaker/CuraEngine