merge ruby/ruby@e44d412 upstream from r43618