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