Merge commit 'svn-vim' into vim