Merge pull request #4805 from WoltLab/package-xsd