From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 5 Nov 2015 18:11:55 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=880657bd5018403764cfd8ff6e925b4e4ffb8228;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.14'
---

c58615969b7e916220fe42326fa1cc85b5bac6fc