Merge pull request #1008 from remicollet/issue-librabbitmq-060