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