Merge tag 'v1.1.12' into develop

v1.1.12

Conflicts:
	views/admin/management/packaging.html

diff --cc views/admin/management/packaging.html
index 09b71e6,079521a..4d02647
--- 1/views/admin/management/packaging.html
--- 2/views/admin/management/packaging.html
+++ b/views/admin/management/packaging.html
@@@ -23,9 -22,16 +23,16 @@@
                    {if $packagingSettings.fieldFail.canonical_package_page}<p>{$packagingSettings.fieldFail.canonical_package_page}</p>{/if}
                </td>
            </tr>
+             <tr>
+               <th {if $packagingSettings.fieldRequired.package_link_text_member_list}class="glm-required"{/if}>Package Link Text for Member List:</th>
+               <td {if $packagingSettings.fieldFail.package_link_text_member_list}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
+                   <input type="text" name="package_link_text_member_list" value="{$packagingSettings.fieldData.package_link_text_member_list}" class="glm-form-text-input-medium">
+                   {if $packagingSettings.fieldFail.package_link_text_member_list}<p>{$packagingSettings.fieldFail.package_link_text_member_list}</p>{/if}
+               </td>
+           </tr>
              <tr><td><input class="updateSettings button" type="submit" value="Update Settings" /></td></tr>
          </table>
 -        
 +
          <!-- Package List Settings -->
          <table id="glm-table-packaging-list" class="glm-admin-table glm-settings-table glm-hidden">
              <tr>