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