From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 12 Jan 2017 17:27:26 +0000 (-0500)
Subject: Merge branch 'hotfix/1.5.6'
X-Git-Tag: v1.5.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fb91dda52077dbb64951eac4b6e61e981ad498f7;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.5.6'
---

fb91dda52077dbb64951eac4b6e61e981ad498f7