Merge branch 'w31_MDL-28450_m22_defgroup' of git://github.com/skodak/moodle