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