Merge branch 'xml-namespaces'