Merge "Fixes statsd returning too much data at once." into pi-dev