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