upstream update to 7.4a.44
Merge branch 'master' into cjk_linebreak
upstream update to 7.4b.5
Merge branch 'master' into cjk_linebreak