From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 11 Mar 2016 16:14:15 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.19'
X-Git-Tag: v1.0.19^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=23e49d85aa9d7a0e9287c7c525dfa72e5af4c677;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.19'
---

23e49d85aa9d7a0e9287c7c525dfa72e5af4c677