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

Merge branch 'hotfix/1.5.5'
---

d2f6cf41ee7fc6e7d68b5b107bdb9ba4509a7fe4