master is master
Merge remote-tracking branch 'origin/master' into Mike

Conflicts:
	WorkingFolder/test.cpp