[sr-dev] git:master:676a2d0a: Merge pull request #488 from mslehto/statsd6