Merge branch 'MDL-65311-xml-files' of https://github.com/brendanheywood/moodle