Remove references to people_group in report query
Merge branch 'master' into rails4