From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 21 Oct 2015 20:06:35 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.10'
X-Git-Tag: v1.0.10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9cbfb19280aa6941b7a0eb5f5ee8aae08ba0ccb3;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.10'
---

ba3b4bb0454f26766d4c8fff0270eb906306b646