Switch print_z to unscaled coordinates
Merge branch 'master' into new-support2

Conflicts:
	lib/Slic3r/Layer.pm
	lib/Slic3r/Print/Object.pm