Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle