Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle