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