Merge pull request #681 from VPeruS/missing-xml