Merge branch 'release/2.47'

Conflicts:
	GitExtensions/Program.cs
	GitUI/CommandsDialogs/SettingsDialog/Pages/ChecklistSettingsPage.cs
	Setup/Product.wxs