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