upstream update to 7.3.1293
Merge branch 'master' into cjk_linebreak
upstream update to 7.4a.2
Merge branch 'master' into cjk_linebreak