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