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