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