From 0a749023cb91accb1a5c8d097adba59b411fa4da Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Fri, 24 Jan 2014 14:19:24 -0500
Subject: [PATCH 1/2] fixing if statements inside a @first / @last block

---
 public/src/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/templates.js b/public/src/templates.js
index a004553b7c..06295dc79e 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -378,7 +378,7 @@
 						checkConditional(namespace + d, data[d]);
 						checkConditional('!' + namespace + d, !data[d]);
 
-						if (blockInfo) {
+						if (blockInfo && blockInfo.iterator) {
 							checkConditional('@first', blockInfo.iterator === 0);
 							checkConditional('!@first', blockInfo.iterator !== 0);
 							checkConditional('@last', blockInfo.iterator === blockInfo.total);

From d5534cf54565cddd0ee699cf1d31104701d3bf89 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 24 Jan 2014 19:55:19 -0500
Subject: [PATCH 2/2] fixing upgrade script on edge builds

---
 src/upgrade.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/upgrade.js b/src/upgrade.js
index acd6585f8d..688d84183f 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -306,6 +306,11 @@ Upgrade.upgrade = function(callback) {
 				updatesMade = true;
 
 				Groups.getByGroupName('Administrators', {}, function(err, groupObj) {
+					if (err && err.message === 'gid-not-found') {
+						winston.info('[2014/1/23] Updating Administrators Group -- skipped');
+						return next();
+					}
+
 					Groups.update(groupObj.gid, {
 						name: 'administrators',
 						hidden: '1'