Merge branch 'master' into LibGit2Sharp

Conflicts:
	GitCommands/CommitData.cs
	GitCommands/Git/GitModule.cs
	GitCommands/Settings/AppSettings.cs
	GitExtensionsTest
	GitUI/CommandsDialogs/FormPull.cs
	GitUI/UserControls/ToolStripGitStatus.cs
	Plugins/GitUIPluginInterfaces/IGitModule.cs
	Setup/Product.wxs