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