https://github.com/celery/celery/issues/2357
Merge pull request #2358 from mpermana/master

https://github.com/celery/celery/issues/2357