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