Recreate location aggregation
Merge pull request #1271 from njam/issue-1271

Recreate location aggregation