From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 25 Aug 2017 20:06:07 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.17'
X-Git-Tag: v1.2.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d23b9e14b28d384369b0ba903c2d5781588d231e;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.17'
---

e7d412cac21bbcf94c891afd85a1c09a30124c2c