Fixed unbound reference error "client"
Merge branch 'master' of github.com:celery/kombu