Fixes test for #1964
Wording
Adds celery.version_info_t
Fix for QoS when using RabbitMQ 3.3 or later.  (Issue celery/kombu#339)
Add my name to contributors
Merge pull request #1983 from mduggan/worker-heartbeat-option

Add my name to contributors
Changelog stub for 3.1.11
Merge branch 'master' of github.com:celery/celery
Batches: Do not attempt to cancel non-existing tref.  Closes #1984
Use the Connection.qos_semantics_matches_spec property instead
Fix typo in comment ("if if")
Bundle celery[librabbitmq] now depends on librabbitmq 1.5.0
Now depends on kombu 3.0.15
Now depends on billiard 3.3.0.17
Merge pull request #1985 from chris-martin/if-if

Fix typo in comment ("if if")
Stops MongoDB Backend from using BROKER_USE_SSL.

This change effectively disables SSL as set using BROKER_USE_SSL.  SSL support
should be functional through existing mechanisms, but requires doc changes and
testing.  I've documented this potential feature and the necessary work with
celery/celery#1974.
Add Brian Bouterse to AUTHORS and CONTRIBUTORS

Conflicts:
	CONTRIBUTORS.txt
Adding changelog entry
Fix for chord inside chord when using json serializer.  Closes #1987
Merge branch 'master' of github.com:celery/celery