Backport Aggregator changes to 0.7 branch
Merge pull request #367 from twitter/backport-agg

Backport Aggregator changes to 0.7 branch