merge ruby/ruby@5de05f5