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

Merge branch 'hotfix/1.2.11'
---

7aaea972419191f39f2439487f932b3264860ec9