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