Merge branch 'w46_MDL-36283_m23_cohortmembers' of git://github.com/skodak/moodle...