Merge upstream changes to 'svn-vim'