From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 6 Oct 2016 16:57:26 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.36'
X-Git-Tag: v1.0.36^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a37f37e1019dc257efe6dc93315874c3f9a4d7e8;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.36'
---

a37f37e1019dc257efe6dc93315874c3f9a4d7e8