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