Merge commit 'v7.10.18' into 8

Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Storage.pm
	t/Asset/AssetExportHtml.t
	t/Asset/Story.t
	t/Shop/TaxDriver/Generic.t
	t/Storage.t

t/Shop/TaxDriver/Generic.t

@@ -36,8 +36,8 @@ $session->user({userId => 3});
 
 my $addExceptions = getAddExceptions($session);
 
-plan tests => 79
-            +  2*scalar(@{$addExceptions});
+my $tests = 80 + 2*scalar(@{$addExceptions});
+plan tests => $tests;
 
 WebGUI::Test->addToCleanup(SQL => 'delete from tax_generic_rates');
 
@@ -526,6 +526,20 @@ cmp_deeply(
     'getTaxRates: return correct data for a state when the address has alternations'
 );
 
+my $capitalized = $taxer->add({
+    country => 'USA',
+    state   => 'wi',
+    taxRate => '50',
+});
+
+cmp_deeply(
+    $taxer->getTaxRates($taxingAddress),
+    [0, 5, 0.5],
+    '... multiple entries with different capitalization, first matches'
+);
+
+$taxer->delete({ taxId => $capitalized });
+
 #######################################################################
 #
 # calculate