Merge branch 'master' into cjk_linebreak
Merge branch 'cjk_linebreak' into all