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