From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 11 Oct 2019 16:26:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.17'
---

28fa3e48b185bc7eb14b9461919bd058530a9590