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