Merge 'email-sender-porting' into 'trunk'

merged in latest stuffs

diff --cc t/lib/TestApp.pm
index 8d2a831,40b49b9..134e429
--- 1/t/lib/TestApp.pm
--- 2/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@@ -1,7 -1,7 +1,7 @@@
  package # Hide from PAUSE
      TestApp;
  
- use Catalyst;
 -use Catalyst qw/-Debug/;
++use Catalyst qw/ -Debug /;
  use FindBin;
  
  TestApp->config(