Merge early part of git-svn into maint