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