upstream update to 7.3.1156
Merge branch 'master' into myvim
upstream update to 7.3.1195
upstream update to 7.3.1242
Merge branch 'master' into myvim