Fixed #49
Merge remote-tracking branch 'remotes/Ultimaker/master' into Extensio

Conflicts:
	gcodeExport.cpp