Merge commit 'svn-macvim'