Merge pull request #1270 from esdrubal/xmlimplicit