From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 14 Mar 2016 12:56:00 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.23'
X-Git-Tag: v1.0.23
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=23dccc5293e611110dc4dfb467d0a9e0b00cab00;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.23'
---

696eb7d43ec8c3f53cead10be6c03d181c0bb8cd