Merge upstream changes from vim.org
Merge branch 'upstream'