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