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