Merge branch 'master' into ATestBranch

Conflicts:
	TestGit/SomeTestFile.txt