Changes to celery -- Must upgrade to master