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