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^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c58615969b7e916220fe42326fa1cc85b5bac6fc;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.14'
---

c58615969b7e916220fe42326fa1cc85b5bac6fc