Merge commit 'vim_mainline/vim' into floating_point