From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 7 Jan 2015 18:35:27 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.8'
X-Git-Tag: v1.1.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c4939fbe888240f51de677faf59a1c54fc97d65e;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.8'
---

de5872329a2d072b0cab9fa34908165ab2e59163