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