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