Merge branch 'cnxml2html2aloha'