Merge remote branch 'mainstream/master'

Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README

1 files changed, 5 insertions, 1 deletions

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2b9c4add4f..226d1aaa88 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -99,7 +99,7 @@ module Rails
         unless abstract_railtie?(base)
           base.called_from = begin
             call_stack = caller.map { |p| p.split(':').first }
-            File.dirname(call_stack.detect { |p| p !~ %r[railties/lib/rails|rack/lib/rack] })
+            File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-]*/lib/rails|rack[\w\-]*/lib/rack] })
           end
         end
 
@@ -185,6 +185,10 @@ module Rails
       app.metal_loader.paths.unshift(*paths.app.metals.to_a)
     end
 
+    initializer :add_generator_templates do |app|
+      config.generators.templates.unshift(*paths.lib.templates.to_a)
+    end
+
     initializer :load_application_initializers do
       paths.config.initializers.to_a.sort.each do |initializer|
         load(initializer)