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