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