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