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