go
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/magical-common/proj-win32/magical-engine-general.props