From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jan 2017 19:24:38 +0000 (-0500)
Subject: Merge tag 'v1.5.4' into develop
X-Git-Tag: V1.5.9^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=a1c5ca53c07b7d9d8c16660993300c228909832c;p=web%2FKeweenaw.git

Merge tag 'v1.5.4' into develop

Version 1.5.4
---

a1c5ca53c07b7d9d8c16660993300c228909832c