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