Changed magit default remote-tracking branch naming
Merge branch 'master' into windows