Now depends on kombu 3.0.13
Merge branch 'master' of github.com:celery/celery