Merge branch 'MDL-79007_main' of https://github.com/marxjohnson/moodle