From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 29 Apr 2016 20:56:48 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.7'
X-Git-Tag: v1.2.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=685d808b0f68fb8b28489e1679c6ce1ef062e968;p=web%2FMichiganTrailMaps.git

Merge branch 'hotfix/1.2.7'
---

685d808b0f68fb8b28489e1679c6ce1ef062e968