fixes for stefan's fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ffxivminion/ffxiv_mesher.lua