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