From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 19 Jul 2016 17:09:13 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.9'
X-Git-Tag: v1.2.9^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=36d040ed698c725685b643f64ce38b1d1081b2f2;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.9'
---

36d040ed698c725685b643f64ce38b1d1081b2f2