From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 27 Dec 2016 20:37:59 +0000 (-0500)
Subject: Merge branch 'release/1.5.4'
X-Git-Tag: v1.5.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=04bf8d9b44756429726c2522ee779268305b3116;p=web%2FGaylordGolfMecca.git

Merge branch 'release/1.5.4'
---

7c7d16203dfe5f00ee08466850c0e68bf251d5b4