Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 7 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index c8d8b85000..d2c13e030d 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -33,14 +33,16 @@ module I18n
     railtie_name :i18n
 
     # Initialize I18n load paths to an array
-    config.i18n.engines_load_path = []
+    config.i18n.railties_load_path = []
     config.i18n.load_path = []
 
     initializer "i18n.initialize" do
-      require 'active_support/i18n'
-
-      ActionDispatch::Callbacks.to_prepare do
+      ActiveSupport.base_hook(:i18n) do
         I18n.reload!
+
+        ActionDispatch::Callbacks.to_prepare do
+          I18n.reload!
+        end
       end
     end
 
@@ -49,7 +51,7 @@ module I18n
     config.after_initialize do |app|
       app.config.i18n.each do |setting, value|
         case setting
-        when :engines_load_path
+        when :railties_load_path
           app.config.i18n.load_path.unshift(*value)
         when :load_path
           I18n.load_path += value