Update to Ruby 2.1.2
Merge branch 'update-ruby'