after a merge for dotvim from master