From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 2 Nov 2016 17:27:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.3'
X-Git-Tag: v1.2.3^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e8ce75c322be3e4d3ac380c52148aa2c1c9191a7;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.3'
---

e8ce75c322be3e4d3ac380c52148aa2c1c9191a7