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