merge ruby/ruby@757dee1 upstream