WIP
Merge branch 'amqp_exchanges'
wip
Merge branch 'amqp_fixes'