diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ee9410765..64585d283 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
  - fixed #11813: Payment confirmation screen dollar amount
  - fixed #11832: Admin Session Interface broken
  - fixed: Attachment label in the Template is missing
+ - fixed #11810: Attachment list broken in template
 
 7.9.13
  - fixed #11783: Instances deleted during realtime run
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index ba7de5e18..d90fc7c7a 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,19 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.10.0
+--------------------------------------------------------------------
+     * Due to a bug in the 7.8.24-7.9.11 upgrade, the ordering of template
+       attachments has been lost.  The bug has been fixed in 7.9.14 for sites
+       that have not been upgraded yet.  Unfortunately, due to the nature of
+       the bug, the correct ordering cannot be automatically restored.
+
+       Another bug, in the new attachments javascript, will change all attachments
+       to type CSS when the template is saved.  Since there are 2 types of Javascript
+       attachments, there's no way of recovering the original type.  If you are using
+       template attachments and have upgraded to 7.9.13 directly, you will need to
+       check each template and update the types.
+
 7.9.8
 --------------------------------------------------------------------
      * Starting in WebGUI 7.9.4, the Net::Twitter module is required.
diff --git a/www/extras/yui-webgui/build/form/jsontable.js b/www/extras/yui-webgui/build/form/jsontable.js
index 101764e35..bb21b4abf 100644
--- a/www/extras/yui-webgui/build/form/jsontable.js
+++ b/www/extras/yui-webgui/build/form/jsontable.js
@@ -143,7 +143,7 @@ WebGUI.Form.JsonTable.prototype.init
 
         // Fill in values based on field type
         var cells   = newRow.getElementsByTagName( "td" );
-        for ( var i = 0; i < this.columns.length - 1; i++ ) { // Last cell is for buttons
+        for ( var i = 0; i < this.columns.length; i++ ) { // Last cell is for buttons
             var cell        = cells[i];
             var column      = this.columns[i];
             var field       = cell.childNodes[0];