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