Merge pull request #984 from luizluca/ruby-update_to_2.2.1