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