Merge pull request #4846 from luizluca/ruby-2.4.2