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

Merge branch 'hotfix/1.0.20'
---

4c96c0b786fa92838b9f347c5c14dd44289a1de4