Merge pull request #659 from mfournier/amqp-fixups