From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 4 Jan 2017 16:21:07 +0000 (-0500)
Subject: Merge branch 'hotfix/1.5.6'
X-Git-Tag: v1.5.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7a1bd2e2d2be7256c0fec28672ce94d67d146349;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.6'
---

7a1bd2e2d2be7256c0fec28672ce94d67d146349