Merge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle