From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 5 May 2017 20:02:27 +0000 (-0400)
Subject: Merge tag 'v1.0.18' into develop
X-Git-Tag: v1.0.24^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=be60136ce0c24a83ce92678ca17e827ddc46e1d2;p=web%2FSooLocks.git

Merge tag 'v1.0.18' into develop

v1.0.18
---

be60136ce0c24a83ce92678ca17e827ddc46e1d2