More work at upgrading to Ruby 2.1.5