Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle