From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 1 Feb 2016 19:41:55 +0000 (-0500)
Subject: Merge branch 'hotfix/1.4.2'
X-Git-Tag: v1.4.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=acbc439bfab3c818cd8fff3e989f09a54b9cf870;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.4.2'
---

c534ca48e9f0254658db9f7b2683b697ed93cda2