From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 Jan 2017 18:39:55 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.12'
X-Git-Tag: v1.1.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=945f068a6e5ce3f0f60d0e258525d638c4ce57c1;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.12'
---

945f068a6e5ce3f0f60d0e258525d638c4ce57c1