From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 27 Jun 2018 14:37:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=405074b5ed951f6e9e9ab1aaae21b0722c74914d;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.21'
---

8d52788cfe9f605673767efecb917b3b01c825ed