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