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

Merge branch 'hotfix/1.5.5'
---

2258706b179966533b27b4cb45bda6b947086a49