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