upstream update to 7.3.1242
Merge branch 'master' into myvim
Merge branch 'myvim' into all