Minor changes
Merge branch 'master' into Release_1.1.0

Conflicts:
	Windows/TrenchBroom/BuildNo
Build no increased