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