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