Merge branch 'master' into wip_abstract_controller

Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb

1 files changed, 1 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 52abd69a42..ade2d6f05e 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -59,7 +59,7 @@ module ActionDispatch
 
       def inspect
         str = klass.to_s
-        args.each { |arg| str += ", #{arg.inspect}" }
+        args.each { |arg| str += ", #{build_args.inspect}" }
         str
       end
 
@@ -72,7 +72,6 @@ module ActionDispatch
       end
 
       private
-
         def build_args
           Array(args).map { |arg| arg.respond_to?(:call) ? arg.call : arg }
         end