Merge pull request #1497 from poolifier/fix-dynamic-worker-removal-race