upstream update to 7.4b.15
upstream update to 7.4 (yeah~)
Merge branch 'master' into cjk_linebreak