merged from master to sync release

diff --cc Changes
index 0d1c586,595d249..e1eaea0
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,11 -1,19 +1,25 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 +5.90089_001 - TBA
 +  - New Feature: Type Constraints on Args/CapturArgs.  ALlows you to declare
 +    a Moose, MooseX::Types or Type::Tiny named constraint on your Arg or 
 +    CaptureArg.
 +  - New top level document on Route matching. (Catalyst::RouteMatching).
 +
+ 5.90085 - 2015-03-25
+   - Small change to Catalyst::Action to prevent autovivication of Args value (dim1++)
+   - Minor typo fixes (Abraxxa++)
+   - Make sure than when using chained actions and when more than one action
+     matches the same path specification AND has Args(0), that we follow the
+     "in a tie, the last action defined wins" rule.  There is a small chance
+     this is a breaking change for you.  See Catalyst::Upgrading for more.
+     You may use the application configuration setting "use_chained_args_0_special_case"
+     to disable this new behavior, if you must for back-compat reasons.
+   - Added PATCH HTTP Method action attribute shortcut.
+   - Several new configuration options aimed to give improved backwards compatibility
+     for when your URL query parameters or keywords have non UTF-8 encodings.
+     See Catalyst::Upgrading.
+ 
  5.90084 - 2015-02-23
    - Small change to the way body parameters are created in order to prevent
      trying to create parameters twice.

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Controller.pm
Simple merge

diff --cc lib/Catalyst/DispatchType/Chained.pm
Simple merge

diff --cc lib/Catalyst/Runtime.pm
index cc02f87,4e16a4f..572f50f
--- 1/lib/Catalyst/Runtime.pm
--- 2/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@@ -1,4 -1,4 +1,3 @@@
--package Catalyst::Runtime;
  
  use strict;
  use warnings;