Tests passing
Merge branch '3.1' of github.com:celery/celery into 3.1