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