Merge branch '3824-task-work' closes #3824
authorTom Clegg <tom@curoverse.com>
Mon, 17 Nov 2014 16:05:14 +0000 (11:05 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 17 Nov 2014 16:05:14 +0000 (11:05 -0500)

Trivial merge