Merge pull request #6640 from annando/worker-stats