Merge commit 'git-svn' into vim