From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 5 May 2017 20:02:23 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=847a0ce0db77968ae93c3ec33aed001b0045d672;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.18'
---

423a8adeac534b195eaec1d2680af67b496e414d