From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 29 Sep 2016 18:50:50 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.15'
X-Git-Tag: v1.0.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=690638ce1049569c9956b416c06fd4fc4f72167f;p=web%2FSooLocks.git

Merge branch 'hotfix/1.0.15'
---

6810cd5ee6a7c8c7fbcf6b19b453d4734b0e9b7a