Tidy up git-svn command
Merge remote-tracking branch 'upstream/master'