Merge remote-tracking branch 'tmworigserverdata/master' into heat-spell

Conflicts:
	client-data