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