Merge branch 'xelatex' into doc/4.9