merge ruby/ruby@b19a968 upstream