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