From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 12 Sep 2014 13:07:00 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c3d5e97dd85727888f84538cc2e0b48a96d391bc;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.7'
---

c3d5e97dd85727888f84538cc2e0b48a96d391bc