Fix build issue.
Merge remote-tracking branch 'gitextensions/master' into BuildServerIntegration