Merge branch 'wip-MDL-36544-m24' of github.com:amygroshek/moodle