Merge branch 'MDL-37785_master' of git://github.com/lazydaisy/moodle