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