Fixup for ruby 1.8.7
Merge branch 'hotfix/fix_ruby_1_8_7'