Merge pull request #1179 from ianpartridge/xmlleak-4.0