Support for Celery 3.1.4 and fix serialization issue