From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Jun 2018 18:14:45 +0000 (-0400)
Subject: Merge branch 'release/1.5.21'
X-Git-Tag: v1.5.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e75ebabb33d2a5348d1e4bb5a820ac904ec37714;p=web%2FGaylordGolfMecca.git

Merge branch 'release/1.5.21'
---

d9fcbc9feb6fcaf2e80bf234a1ea57bc6c3e9116