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