Merge branch 'MDL-81109-main' of https://github.com/lucaboesch/moodle