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