Merge pull request #6598 from annando/worker-index