From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 4 May 2017 19:53:05 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.14' into develop
X-Git-Tag: v1.5.17^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=af2bed218b0b2b112506ea6796349238635eab97;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.14' into develop
---

af2bed218b0b2b112506ea6796349238635eab97