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