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