Attempt to fix #1914
Merge branch 'master' of github.com:celery/celery