Merged-By: hsbt <hsbt@ruby-lang.org>