vim-patch:7.4.487 vim-patch:6a598be

https://code.google.com/p/vim/source/detail?r=6a598be6d4e8

a1c4630 adds the failing test, and a3303c9 fixes it.