4044: Merge branch 'master' into 4044-crunchstat-wait
authorTom Clegg <tom@curoverse.com>
Wed, 8 Oct 2014 14:58:23 +0000 (10:58 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 8 Oct 2014 14:58:23 +0000 (10:58 -0400)

Trivial merge