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