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