forward
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/magical-common/magical-common.vcxproj.filters