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

Merge branch 'hotfix/1.0.17'
---

5b74de004361a29b488417baff3a8edb654519fb