Type
Merge remote-tracking branch 'origin/master'

Conflicts:
	Compilers/Compilers/Compilers.vcxproj.filters