upstream update to 7.3.861
Merge branch 'master' into myvim