Merge branch 'vim' into fix/fast-join