Fixed #2391
Reverted an unwanted formatting change
Merge branch 'master' of https://github.com/celery/celery into minor-fixes
Remove duplicate entry in __all__