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, 3 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0c3c7737ea..dd01bbab1d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -112,7 +112,7 @@ module Rails
 
     def load_console(sandbox=false)
       initialize_console(sandbox)
-      railties.all { |r| r.load_console }
+      railties.all { |r| r.load_console(sandbox) }
       super()
       self
     end
@@ -152,7 +152,7 @@ module Rails
         end
 
         if config.serve_static_assets
-          middleware.use ::ActionDispatch::Static, paths["public"].first
+          middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
         end
 
         middleware.use ::Rack::Lock unless config.allow_concurrency
@@ -196,7 +196,6 @@ module Rails
 
     def initialize_console(sandbox=false)
       require "rails/console/app"
-      require "rails/console/sandbox" if sandbox
       require "rails/console/helpers"
     end
   end