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