From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 8 Aug 2014 17:07:48 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.6'
X-Git-Tag: v1.1.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e3af0e207f7839c72b50c2eb952d5f258fad23bd;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.6'
---

3b3fff3c6797bf6d5fb2f7d812650b768990d49d