upstream update to 7.3.797
Merge branch 'master' into myvim
upstream update to 7.3.831
Merge branch 'master' into myvim