Rebase from upstream
Merge branch 'master' into vim_no_compile