Merge pull request #3547 from luizluca/ruby-update