From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 May 2016 17:43:15 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.29'
X-Git-Tag: v1.0.29
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=428298e33733b47a77da639aa0c53f6e595d8407;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.29'
---

0830f9a9f8e170dc2c7389c4652c9943bd688dc8