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