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, 5 insertions, 6 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index f445ef4831..49388c5060 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -52,7 +52,10 @@ module Rails
 
     class << self
       private :new
-      alias   :configure :class_eval
+
+      def configure(&block)
+        class_eval(&block)
+      end
 
       def instance
         if self == Rails::Application
@@ -85,17 +88,13 @@ module Rails
     end
 
     def routes
-      ::ActionController::Routing::Routes
+      @routes ||= ActionDispatch::Routing::RouteSet.new
     end
 
     def railties
       @railties ||= Railties.new(config)
     end
 
-    def metal_loader
-      @metal_laoder ||= MetalLoader.new
-    end
-
     def routes_reloader
       @routes_reloader ||= RoutesReloader.new
     end