From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 17 Feb 2016 14:42:27 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=df703444b3670a40528608b2594401773506816d;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.18'
---

df703444b3670a40528608b2594401773506816d