Merge remote-tracking branch 'upstream/dev' into Wires

Conflicts:
	code/game/machinery/autolathe.dm