Micro-optimizations to the groups feature
Merge pull request #261 from GrahamCampbell/multiple-fixes

Micro-optimizations to the groups feature