Merge branch 'ms/git-svn-1.7'