From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 16 Aug 2016 19:02:13 +0000 (-0400)
Subject: Merge tag 'v1.0.14' into develop
X-Git-Tag: v1.0.17^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=16aba3521128af583985a966d21d5ed939e028f8;p=web%2FSooLocks.git

Merge tag 'v1.0.14' into develop

version 1.0.14
---

16aba3521128af583985a966d21d5ed939e028f8