From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 20 Aug 2018 12:22:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.14'
X-Git-Tag: v1.0.14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bd4a8d2cdd3b6c431412a806a1b9a8ea43b6543b;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.14'
---

efa250452515d391788f5768a5247a00fefc05d5