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