fix group deletion code, again
Merge commit 'github/testing' into beta