Tidied.
Improved caching in Group.pm.
Merge remote-tracking branch 'upstream/master'