Merge commit 'svn-vim'