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