Merge branch 'pr/n2236_PhilipDaniels'

Conflicts:
	GitUI/CommandsDialogs/SettingsDialog/CheckSettingsLogic.cs
	GitUI/CommandsDialogs/SettingsDialog/Pages/GitSettingsPage.cs