From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 5 Nov 2015 21:31:58 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: v1.0.15^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9a5ea16b19095dfe56a3ff786f4a6a0d8813d0ed;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.15'
---

9a5ea16b19095dfe56a3ff786f4a6a0d8813d0ed