Merge pull request #1348 from FlorianFieber/vim