Merge branch 'MDL-57682-master' of git://github.com/rezaies/moodle