Merge branch 'wip-MDL-52566-master' of https://github.com/cdsmith-umn/moodle