Ruby upgrade

This change upgrades the versions of Ruby that the project is built
and tested against.
Merge remote-tracking branch 'upstream/master'