Merge branch 'master-git' into branch_0.13.0

Conflicts:

	src/chxj_ixhtml10.c
	src/chxj_jxhtml.c

diff --cc src/chxj_ixhtml10.c
Simple merge

diff --cc src/chxj_jxhtml.c
Simple merge