Merge branch 'uh/git-svn-serf-fix'