From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 18 Mar 2015 17:31:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.8'
X-Git-Tag: v1.0.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f29ed4431378c6821848c603d7f5667cdd96adde;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.8'
---

bdaa230d33711b800469111cc7da42588075d0ac