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