Pulling changes from vuhl/AMQPCarapace