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