Merge branch 'master' into cherry

Conflicts:
	activesupport/lib/active_support.rb

5 files changed, 7 insertions, 1 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 6df572268c..abaee2829e 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActionDispatch
   class ParamsParser
     ActionController::Base.param_parsers[Mime::XML] = :xml_simple
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb
index 1fd65ed006..c709c3f1eb 100644
--- a/activerecord/lib/active_record/serializers/json_serializer.rb
+++ b/activerecord/lib/active_record/serializers/json_serializer.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActiveRecord #:nodoc:
   module Serialization
     def self.included(base)
diff --git a/activeresource/lib/active_resource/formats/json_format.rb b/activeresource/lib/active_resource/formats/json_format.rb
index 1d88fc5f16..101027d99e 100644
--- a/activeresource/lib/active_resource/formats/json_format.rb
+++ b/activeresource/lib/active_resource/formats/json_format.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module ActiveResource
   module Formats
     module JsonFormat
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index f240cbf5e4..0879535487 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -51,6 +51,5 @@ module ActiveSupport
 end
 
 require 'active_support/vendor'
-require 'active_support/json'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 7d8a07654d..9b4b207c88 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'abstract_unit'
+require 'active_support/json'
 
 class TestJSONDecoding < ActiveSupport::TestCase
   TESTS = {