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