Merge branch 'dev' (celery-3-0-13 bugfix)