Merge branch 'w35_MDL-23875_m24_selfcohort' of git://github.com/skodak/moodle