Merge pull request #4957 from sartura/vim_bump_to_8.0.586