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