Merge branch 'vim' into feat/lua