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