Merge pull request #833 from matrix-israel/groups_fix_06_06_17