merging upstream statsd changes