Merge branch 'master' of https://github.com/rails/rails into performance_test

Conflicts:
	activesupport/lib/active_support/testing/performance.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 9c9d85eed6..9f21d273e6 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -1,4 +1,5 @@
 require "active_support/notifications"
+require "active_support/dependencies"
 require "active_support/descendants_tracker"
 
 module Rails
@@ -9,7 +10,6 @@ module Rails
       initializer :load_environment_hook do end
 
       initializer :load_active_support do
-        require 'active_support/dependencies'
         require "active_support/all" unless config.active_support.bare
       end
 
@@ -37,6 +37,7 @@ module Rails
           )
           logger
         end
+        at_exit { Rails.logger.flush if Rails.logger.respond_to?(:flush) }
       end
 
       # Initialize cache early in the stack so railties can make use of it.