Merge branch '4839-worker-state' closes #4839
authorTom Clegg <tom@curoverse.com>
Thu, 12 Feb 2015 19:24:55 +0000 (14:24 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 12 Feb 2015 19:24:55 +0000 (14:24 -0500)

Trivial merge