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