masterchange
Merge branch 'master' into test-branch

Conflicts:
	TestRepoGit/Class1.cs