From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 29 Sep 2016 18:48:00 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.34'
X-Git-Tag: v1.0.34^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f66c34dc81133625940d65a68a5d316bfc475443;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.34'
---

f66c34dc81133625940d65a68a5d316bfc475443