Merge branch 'MDL-68067-42' of https://github.com/Chocolate-lightning/moodle into...