Merge remote-tracking branch 'gitextensions/master' into BuildServerIntegration

Conflicts:
	GitUI/UserControls/RevisionGrid.cs