Merge remote-tracking branch 'vim/master'

This is a fix for the previous merge commit that was accidentally
cherry-picked and converted to a non-merge commit.