Upstream update of gs.groups
Merge branch 'master' into 2014-skin