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