Merge commit 'vim_mainline/vim' into variable_tabstops