Merge branch 'celery'