Merge branch 'master' into olefloch/OPS-1018/clicks_in_datadog
Fix race condition
Mock statsd and check that we're incrementing counters
Merge pull request #21 from olivierlefloch/olefloch/OPS-1018/clicks_in_datadog

Olefloch/ops 1018/clicks in datadog
Merge branch 'master' into olefloch/OPS-1414/nb_tries_to_datadog