Merge commit '17ce3572bf' into WebGUI8. All tests passing.

t/Shop/TaxDriver/Generic.t

@@ -41,6 +41,8 @@ my $addExceptions = getAddExceptions($session);
 plan tests => 79
             +  2*scalar(@{$addExceptions});
 
+WebGUI::Test->addToCleanup(SQL => 'delete from tax_generic_rates');
+
 #----------------------------------------------------------------------------
 # put your tests here
 
@@ -666,9 +668,4 @@ sub getAddExceptions {
         },
     ];
 }
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-    $session->db->write('delete from tax_generic_rates');
-}
+#vim:ft=perl