Merge branch 'xmldoc'