Ruby 1.9 fix
Merge branch 'ruby_1_9'