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