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