Merge fix for celery/billiard#1573 to stop workers dying on startup.