Merge r44696 upstream from ruby/ruby@dacf4ce