Merge branch 'vim' into master