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