Merge branch '3.0-stable'

Conflicts:
	README.md

middleman-core/lib/middleman-core/core_extensions/front_matter.rb

@@ -72,8 +72,9 @@ module Middleman::CoreExtensions
         @cache.delete(path)
       end
 
-      YAML_ERRORS = [ Exception, ArgumentError ]
+      YAML_ERRORS = [ StandardError ]
 
+      # https://github.com/tenderlove/psych/issues/23
       if defined?(Psych) && defined?(Psych::SyntaxError)
         YAML_ERRORS << Psych::SyntaxError
       end

middleman-core/lib/middleman-core/core_extensions/rendering.rb

@@ -19,6 +19,9 @@ module Middleman
           # Include methods
           app.send :include, InstanceMethods
 
+          app.define_hook :before_render
+          app.define_hook :after_render
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb
@@ -249,7 +252,10 @@ module Middleman
           end
 
           # Render using Tilt
-          template.render(context, locs, &block)
+          run_hook :before_render, template.data, template
+          content = template.render(context, locs, &block)
+          run_hook :after_render, content, template
+          return content
         ensure
           # Reset stored buffer
           @_out_buf = _buf_was