Merge branch 'MDL-79003-main' of https://github.com/andrewnicols/moodle