Merge 'origin/master' into mine/foo

Conflicts:
	dda.c
	simulator/heater_sim.c
	testcases/run-in-simulavr.sh
	testcases/triangle.gcode