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