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