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

Merge branch 'hotfix/1.0.37'
---

f90b9bc20ec18a83ba6e1b4f1f3711e537d37024