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