Merge remote branch 'rails/master' into identity_map

Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb

1 files changed, 5 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/result.rb b/activerecord/lib/active_record/result.rb
index 8deff1478f..0465b21e88 100644
--- a/activerecord/lib/active_record/result.rb
+++ b/activerecord/lib/active_record/result.rb
@@ -20,10 +20,14 @@ module ActiveRecord
       hash_rows.each { |row| yield row }
     end
 
+    def to_hash
+      hash_rows
+    end
+
     private
     def hash_rows
       @hash_rows ||= @rows.map { |row|
-        ActiveSupport::OrderedHash[@columns.zip(row)]
+        Hash[@columns.zip(row)]
       }
     end
   end