upstream update to 7.3.797
Merge branch 'master' into cjk_linebreak
upstream update to 7.3.831
upstream update to 7.3.861
upstream update to 7.3.875
Merge branch 'master' into cjk_linebreak