Merge pull request #13156 from neheb/vim