Upstream release - 4d
Merge branch 'upstream'

Keeping Putnam's new itemsyndrome script. He's assured me it's
suitable for DFHack r3 and better in all ways.

No other significant conflicts.

Conflicts:
	Dwarf Fortress/hack/scripts/itemsyndrome.lua
	Dwarf Fortress/raw/objects/creature_pet_masterwork.txt
	Dwarf Fortress/raw/objects/reaction_masterwork.txt
Upgrade unified branch to 4d from master

Merge branch 'master' into unified

All conflicts were trivial, and adopt the master branch version of
each file.

Conflicts:
	Dwarf Fortress/dfhack.history
	Dwarf Fortress/gamelog.txt
	Dwarf Fortress/stderr.log