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