3826: Merge branch 'master' into 3826-crunchstat-netstats
authorTom Clegg <tom@curoverse.com>
Mon, 20 Oct 2014 16:34:58 +0000 (12:34 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 20 Oct 2014 16:34:58 +0000 (12:34 -0400)

Trivial merge