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