(master) fixed bug with set upstream potentially tracking the wrong branch because none was specified
Merge remote-tracking branch 'origin/master' into GitScripts3