From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 21 Jun 2017 17:09:26 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.12'
X-Git-Tag: v1.2.12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=780a21f8c1248428e2d6a98c00b478cc1d3821e7;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.12'
---

641c6b2a1439f04da0348de818c25992ab8f4ae6