From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 8 Jul 2016 18:50:14 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.2'
X-Git-Tag: v1.5.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f642aaf0d0201cfff0587cd2664f2dd09efc8519;p=web%2FGaylordGolfMecca.git

Merge branch 'hotfix/1.5.2'
---

be01d697ebae035d8fa1db64bf048001be39a5c5