merge ruby/ruby@e44d412 upstream from r43618
Merge pull request #35 from zzak/merge_r43618_upstream

merge ruby/ruby@e44d412 upstream from r43618