Merge branch 'w38_MDL-35465_m24_cohortscleanup' of git://github.com/skodak/moodle