From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Apr 2016 19:01:25 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.24'
X-Git-Tag: v1.0.24^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=23aeb6be395f06565ae04c847181cc3c33f32834;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.24'
---

23aeb6be395f06565ae04c847181cc3c33f32834