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