Merged: https://github.com/ruby/ruby/pull/2366