Merge branch 'MDL-74447' of https://github.com/Chocolate-lightning/moodle