Sync up with the stable branch (small change to the way worker threads
exit that sneaked onto the branch by mistake).