Merge branch 'xalan-c-1.12'