Fix ExStatsD url
Merge branch 'master' into staging