From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jan 2017 19:24:30 +0000 (-0500)
Subject: Merge branch 'release/1.5.4'
X-Git-Tag: v1.5.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4a3835e90ad920d6d70cf5bace24e222aa169ca3;p=web%2FKeweenaw.git

Merge branch 'release/1.5.4'
---

015035197a1f1abafcade56d1fcc538ceb0fdbcf