Attempt to fix the tests on ruby 1.9.2
Merge remote-tracking branch 'origin/fix-travis-ruby-1.9.2'