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

Merge branch 'hotfix/1.0.22'
---

75284bbc632c397ce0d018e7e67a7edf6a374787