Changes for Ruby 1.9