Merge branch 'statsd-down' into sensiolabs