Merge rubyamqp master to my own master