merge in kombu 3.0.13