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