Merge master into gsoc_breadboard

diff --cc Makefile.PL
Simple merge

diff --cc TODO
Simple merge

diff --cc lib/Catalyst.pm
index 7f5c31c,725445b..61e2803
--- 1/lib/Catalyst.pm
--- 2/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -875,23 -998,8 +835,9 @@@ sub path_to 
  sub plugin {
      my ( $class, $name, $plugin, @args ) = @_;
  
 +    # See block comment in t/aggregate/unit_core_plugin.t
-     $class->log->warn(qq/Adding plugin using the ->plugin method is deprecated, and will be removed in Catalyst 5.81/);
+     # See block comment in t/unit_core_plugin.t
+     $class->log->warn(qq/Adding plugin using the ->plugin method is deprecated, and will be removed in a future release/);
  
      $class->_register_plugin( $plugin, 1 );
  

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

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

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