Don't show old groups at the moment as there won't be any.
Merge remote-tracking branch 'origin/master'