From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 5 Apr 2017 17:50:10 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.8'
X-Git-Tag: v1.5.8^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4649ccc1ed9a583680023ee7ce5a5334bf4e37bd;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.5.8'
---

4649ccc1ed9a583680023ee7ce5a5334bf4e37bd