Merge pull request #1376 from rubenk/amqp-fix-buffer-size