Merge branch 'jn/maint-trim-vim-contrib' into maint