Get Ruby 1.8.7 working again
Merge branch 'fix-1.8.7'