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