From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 17 Jan 2017 15:10:50 +0000 (-0500)
Subject: Merge branch 'hotfix/1.5.7'
X-Git-Tag: v1.5.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=359c51d223fbcb15c063df771e0bf969d6d20c88;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.5.7'
---

359c51d223fbcb15c063df771e0bf969d6d20c88