Merge pull request #442 from Perksey/patch-1

Advance notice of old-style grouping removals