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