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