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