Imported Upstream version 30.33
Imported Upstream version 31
Merge tag 'upstream/31'

Upstream version 31

Conflicts:
	Beaver.egg-info/PKG-INFO
	PKG-INFO
	README
	README.rst
	beaver/config.py
	beaver/transports/rabbitmq_transport.py