Merge pull request #7296 from jaimeMF/xml_attrib_unicode