Merge branch 'MDL-65744' of git://github.com/Chocolate-lightning/moodle