Merge branch 'master' into gsoc_breadboard

diff --cc Makefile.PL
Simple merge

diff --cc lib/Catalyst.pm
index 61e2803,6c32146..596e6d1
--- 1/lib/Catalyst.pm
--- 2/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -72,9 -73,9 +72,9 @@@ our $GO        = Catalyst::Exception::G
  #I imagine that very few of these really need to be class variables. if any.
  #maybe we should just make them attributes with a default?
  __PACKAGE__->mk_classdata($_)
 -  for qw/components arguments dispatcher engine log dispatcher_class
 +  for qw/container arguments dispatcher engine log dispatcher_class
    engine_loader context_class request_class response_class stats_class
-   setup_finished _psgi_app loading_psgi_file/;
+   setup_finished _psgi_app loading_psgi_file run_options/;
  
  __PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
  __PACKAGE__->request_class('Catalyst::Request');

diff --cc t/author/spelling.t
Simple merge