From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 5 May 2017 19:59:31 +0000 (-0400)
Subject: Merge tag 'v1.0.17' into develop
X-Git-Tag: v1.0.24^2~7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=09aebb0985146c7980bcdb6f920e6617998a06aa;p=web%2FSooLocks.git

Merge tag 'v1.0.17' into develop

v1.0.17
---

09aebb0985146c7980bcdb6f920e6617998a06aa