Merge pull request #3945 from InBetweenNames/update-vim