Merge branch 'master' into requiring-vim-7-3