Merge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle