Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle