Merge branch 'master' of https://github.com/sgewuhan/vim.git
Merge branch 'master' of https://github.com/sgewuhan/vim.git

Signed-off-by: ghuazh <ghuazh@gmail.com>