upstream update to 7.3.1274
Merge branch 'master' into cjk_linebreak
Merge branch 'cjk_linebreak' into all

Conflicts:
	src/mbyte.c
upstream update to 7.3.1293
Merge branch 'master' into cjk_linebreak
Merge branch 'cjk_linebreak' into all
doc/tags
upstream update to 7.4a.2
Merge branch 'master' into cjk_linebreak
Merge branch 'cjk_linebreak' into all