Merge pull request #107 from youtube/replication

To fix a case where the worker hangs.