Support celery as well.
Merged.