Merge branch 'release/2.47'

Conflicts:
	GitUI/CommitInfo/CommitInfo.cs