merged conflicts

diff --cc Changes
index 9bacae2,e571b5e..e143aea
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -1,15 -1,8 +1,17 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 +5.90073 - 2014-09-23
 +  - Fixed a regression caused by the last release where we broke what happened
 +    when you tried to set request parameters via $c->req->param('foo', 'bar').
 +    You shouldn't do this, but I guess I shouldn't have busted it either :)
+   - Allow the term_width to be regenerated (see Catalyst::Utils::term_width,
+     Frew Schmidt)
  
 +5.90072 - 2014-09-15
 +  - In the case where you call $c->req->param(undef), warn with a more useful
 +    warning (now gives the line of your code that called param with the undef,
 +    so you can go to hunt it out.
 +
  5.90071 - 2014-08-10
    - Travis config now performs basic reverse dependency testing.
    - Restored deprecated 'env' code in Engine.pm b/c it is still being used out