Py3 fixes
Fixes typo that caused a bogus maxtasksperchild deadlock warning
Merge branch 'master' of github.com:celery/celery