Merge branch 'w31_MDL-28468_m22_cohortassign' of git://github.com/skodak/moodle