Merge 'trunk' into 'dbicadmin_refactor'

diff --combined lib/DBIx/Class.pm
index d81d42c,4298620..ae77c65
--- 1/lib/DBIx/Class.pm
--- 2/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -253,8 -253,6 +253,8 @@@ dyfrgi: Michael Leuchtenburg <michael@s
  
  frew: Arthur Axel "fREW" Schmidt <frioux@gmail.com>
  
 +goraxe: Gordon Irving <goraxe@cpan.org>
 +
  gphat: Cory G Watson <gphat@cpan.org>
  
  groditi: Guillermo Roditi <groditi@cpan.org>
@@@ -321,7 -319,7 +321,7 @@@ rbuels: Robert Buels <rmb32@cornell.edu
  
  rdj: Ryan D Johnson <ryan@innerfence.com>
  
- ribasushi: Peter Rabbitson <rabbit+dbic@rabbit.us>
+ ribasushi: Peter Rabbitson <ribasushi@cpan.org>
  
  rjbs: Ricardo Signes <rjbs@cpan.org>