Merge commit 'vim_mainline/vim' into feat/rel-line-numbers