Now works with Celery 3.1rc