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