Merge ruby/ruby@dff0aa5 upstream