From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 4 Jan 2017 16:24:53 +0000 (-0500)
Subject: Merge branch 'hotfix/1.5.7'
X-Git-Tag: v1.5.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=9c5b42d7a8722828916937538b40c002ac866e43;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.7'
---

f2bd6121e1ae0e704977d093ba4ed16bead96567