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