merged after conflict resolution

diff --cc Makefile.PL
index 382ad89,a37f617..b50b74f
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -97,7 -94,7 +97,8 @@@ else 
  
  push(@author_requires, 'CatalystX::LeakChecker', '0.05');
  push(@author_requires, 'Catalyst::Devel', '1.0'); # For http server test
 +push(@author_requires, 'Test::WWW::Mechanize::Catalyst', '0.51');
+ push(@author_requires, 'Test::TCP', '1.27'); # ditto, ships Net::EmptyPort
  
  author_tests('t/author');
  author_requires(

diff --cc lib/Catalyst.pm
index a6170d3,2e03326..17605d4
--- 1/lib/Catalyst.pm
--- 2/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -3191,12 -3183,19 +3199,23 @@@ C<< $c->request->base >> will be incorr
  
  C<using_frontend_proxy> - See L</PROXY SUPPORT>.
  
 +=item *
 +
 +C<encoding> - See L</ENCODING>
 +
  =back
  
+ =item abort_chain_on_error_fix => 1
+ 
+ When there is an error in an action chain, the default behavior is to continue
+ processing the remaining actions and then catch the error upon chain end.  This
+ can lead to running actions when the application is in an unexpected state.  If
+ you have this issue, setting this config value to true will promptly exit a
+ chain when there is an error raised in any action (thus terminating the chain 
+ early.)
+ 
+ In the future this might become the default behavior.
+ 
  =head1 INTERNAL ACTIONS
  
  Catalyst uses internal actions like C<_DISPATCH>, C<_BEGIN>, C<_AUTO>,

diff --cc t/lib/TestApp.pm
index c1ec9b5,89332ba..b06880c
--- 1/t/lib/TestApp.pm
--- 2/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@@ -50,7 -50,7 +50,8 @@@ TestApp->config
              action_action_nine => { another_extra_arg => 13 }
          }
      },
 +    encoding => 'UTF-8',
+     abort_chain_on_error_fix => 1,
  );
  
  # Test bug found when re-adjusting the metaclass compat code in Moose