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