Upstream release - 4e
Merge branch 'upstream'

All conflicts were trivially resolved.

Eyeballing all changes doesn't show any obvious regressions.

Conflicts:
	MasterworkDwarfFortress/graphics/patch-graphics-from-master.pl