merged in

diff --cc Changes
index 1eaf0a9,ae21dcc..ae86e24
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,11 -1,10 +1,14 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 +TBA
+   ! Stricter checking of attributes in Catalyst::DispatchType::Chained:
+     1) Only allow one of either :CaptureArgs or :Args
+     2) :CaptureArgs() argument must be numeric
    - Add Devel::InnerPackage to dependencies, fixing tests on perl 5.17.11
      as it's been removed from core. RT#84787
 +  - New support for closing over the PSGI $writer object, useful for working
 +    with event loops.
 +
  
  5.90030 - 2013-04-12
    ! POSSIBLE BREAKING CHANGE: Removed Regexp dispatch type from core, and put