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