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

Merge branch 'hotfix/1.2.6'
---

ae23be5d9665a0bc8f2bfa312e161b6e26643223