Merge remote-tracking branch 'origin/master' into LibGit2Sharp

Conflicts:
	GitExtensionsTest.csproj