Merge branch 'wip-MDL-59775-fix' of https://github.com/marinaglancy/moodle