Forward port from GH-13115 from ruby/ruby#27

eightbitraptor merged 2 commits into

mainruby/mmtk:mainfrom

forward-port-from-ruby-masterruby/mmtk:forward-port-from-ruby-masterCopy head branch name to clipboard