From: Steve Sutton <ssutton@gmail.com>
Date: Sun, 11 Sep 2016 00:51:57 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.33'
X-Git-Tag: v1.0.33
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=10866807332c8d4bba5b2bd5d9b2267209110c64;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.33'
---

f81c74f5e4a3a5398e84f438f0a696fd7c00f93a