backport r48127 from ruby/ruby trunk.
add b76941 to History.