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