Merge 'DBIx-Class-current' into 'reorganize_tests'

diff --cc t/53delete_related.t
index 5c47959,f193566..e0cfe12
--- 1/t/53delete_related.t
--- 2/t/53delete_related.t
+++ b/t/53delete_related.t
@@@ -27,3 -28,3 +27,4 @@@ cmp_ok($artist2_cds, '<', $total_cds, '
  
  ok($artist2->delete_related('cds', {title => {like => '%'}}));
  cmp_ok($schema->resultset('CD')->count, '==', ($total_cds - $artist2_cds), 'too many cds were deleted');
++