merge ruby/ruby@826df7f upstream