From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 9 May 2016 19:03:46 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.26'
X-Git-Tag: v1.0.26
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f40a86e31d0e026e94122b37092044bf99e0930e;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.26'
---

192822f585e0a699d2d59f7f460a8b02c4304ecc