Merge branch 'MDL-81409-main' of https://github.com/snake/moodle