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

Conflicts:
	GitCommands/app.config