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