Merge git://bogomips.org/git-svn into maint