diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0adb9a8f8..84c26efef 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,23 @@
 7.8.0
  - upgraded YUI to 2.8.0r4
  - fixed #10998: wiki page locked?
+ - fixed #10862: Version tag contents page
+ - added Subscribable AssetAspect to Wiki
+ - added direct value access in DataForm list view
+ - fixed #11003: Subscribable AssetAspect: no i18n
+ - fixed #11004: Subscribable AssetAspect: handling the subscription group
+ - fixed #10029: Account CSS rule scoping, round #2.
+ - fixed #11012: Code editor corrupts JS
+ - fixed #11019: Ctrl-A blinks and deletes code in Code Editor
+ - fixed #10954: DataForm fails silently
+ - fixed #10901: Calendar More Button/Display Box IE8 error.
+ - fixed #10950: Thingy
+ - fixed #11011: Inherit URL from parent can generate bad URLs
+ - fixed #11010: Purchasing non-recurring subscription twice does not extend group membership
+ - fixed #11009: Shipping address is lost after login
+ - fixed #10990: Survey: View Transposed Results not working
+
+7.7.20
  - fixed #10982: Survey menu options appearing twice
  - fixed #10890: Story Manager: pagination broken for keywords
  - fixed #10856: no paginate in wiki keyword search 
@@ -31,9 +48,7 @@
  - fixed #10928: EMS Print Ticket -- Time not processed for timezone
  - fixed #10889: Old Matrixs break for Admin users
  - fixed #10939: Commit with Approval workflow does not show confirmation screen
- - fixed #10862: Version tag contents page
  - fixed #10943: ThingyRecord JS Broken
- - added Subscribable AssetAspect to Wiki
  - fixed #10941: New user profile fields with unfortunate names
  - fixed #10955: Story Manager: unable to import packages
  - fixed #10970: Newsletter Asset: no subscribe link
@@ -42,25 +57,15 @@
  - fixed #10929: EMS Ticket Start Date Sort
  - fixed #10885: Code Editor breaks Javascript comments
  - fixed #10991: Calendar: bug in Display tab
- - added direct value access in DataForm list view
  - fixed #10987: EMS Schedule -- No Permission Check
  - fixed #10924: Calendar event in last day of month does not display in month/day view
- - fixed #10901: Calendar More Button/Display Box IE8 error.
  - fixed #10954: DataForm fails silently
  - fixed #10950: Thingy
  - fixed #10976: Form::Date not internationalized /DateTime::setToEpoch
  - fixed #11005: calendar feed workflow
  - fixed #11008: Test::Class
- - fixed #11003: Subscribable AssetAspect: no i18n
- - fixed #11004: Subscribable AssetAspect: handling the subscription group
  - fixed #10990: Survey: View Transposed Results not working
- - fixed #11009: Shipping address is lost after login
- - fixed #11010: Purchasing non-recurring subscription twice does not extend group membership
- - fixed #11011: Inherit URL from parent can generate bad URLs
  - fixed #11022: Deleting user shows "TRUE" prompt
- - fixed #10029: Account CSS rule scoping, round #2.
- - fixed #11012: Code editor corrupts JS
- - fixed #11019: Ctrl-A blinks and deletes code in Code Editor
 
 7.7.19
  - fixed #10838: Forwarded forum post email to new CS adds reply to original thread
diff --git a/docs/upgrades/upgrade_7.7.19-7.8.0.pl b/docs/upgrades/upgrade_7.7.20-7.8.0.pl
similarity index 84%
rename from docs/upgrades/upgrade_7.7.19-7.8.0.pl
rename to docs/upgrades/upgrade_7.7.20-7.8.0.pl
index 447540ad3..27b13c1c1 100644
--- a/docs/upgrades/upgrade_7.7.19-7.8.0.pl
+++ b/docs/upgrades/upgrade_7.7.20-7.8.0.pl
@@ -32,9 +32,7 @@ my $session = start(); # this line required
 
 # upgrade functions go here
 reorganizeAdSpaceProperties($session);
-fixTemplateSettingsFromShunt($session);
 addSubscribableAspect( $session );
-addMatrixColumnDefaults($session);
 addFeaturedPageWiki( $session );
 fixEmptyCalendarIcalFeeds( $session );
 upgradeToYUI28( $session );
@@ -167,36 +165,6 @@ sub reorganizeAdSpaceProperties {
     print "DONE!\n" unless $quiet;
 }
 
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub addMatrixColumnDefaults {
-    my $session = shift;
-    print "\tUpdate existing Matrixes with default values for maxComparisons... " unless $quiet;
-    $session->db->write(q|UPDATE Matrix set maxComparisons=25           where maxComparisons           IS NULL|);
-    $session->db->write(q|UPDATE Matrix set maxComparisonsGroupInt=25   where maxComparisonsGroupInt   IS NULL|);
-    $session->db->write(q|UPDATE Matrix set maxComparisonsPrivileged=25 where maxComparisonsPrivileged IS NULL|);
-    # and here's our code
-    print "DONE!\n" unless $quiet;
-}
-
-sub fixTemplateSettingsFromShunt {
-    my $session = shift;
-    print "\tClear isPackage and set isDefault on recently imported templates... " unless $quiet;
-    ASSET: foreach my $assetId (qw/PBtmpl0000000000000137 CarouselTmpl0000000002 aIpCmr9Hi__vgdZnDTz1jw
-                                   2CS-BErrjMmESOtGT90qOg 2rC4ErZ3c77OJzJm7O5s3w pbtmpl0000000000000220
-                                   pbtmpl0000000000000221 2gtFt7c0qAFNU3BG_uvNvg PBtmpl0000000000000081
-                                   ThingyTmpl000000000001 PcRRPhh-0KfvLLNIPdxJTw g8W53Pd71uHB9pxaXhWf_A/) {
-        my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId);
-        next ASSET unless $asset;
-        $asset->update({
-            isPackage => 0,
-            isDefault => 1,
-        });
-    }
-    # and here's our code
-    print "DONE!\n" unless $quiet;
-}
-
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------