From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 May 2017 17:37:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.12'
X-Git-Tag: v1.2.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fc0251afcd834900b968ccd58c4ca68a238d4306;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.12'
---

40fbd44e92aca902dde75da8b238c9a59026b6d9