Merge branch 'MDL-80694' of https://github.com/marinaglancy/moodle