Merge commit 'vim_mainline/vim' into feat/float-point-ext