From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 1 Jun 2016 18:34:24 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.1'
X-Git-Tag: v1.5.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=33e9a625fedfd0fc74455c09a4ec96f8c956c4c1;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.5.1'
---

33e9a625fedfd0fc74455c09a4ec96f8c956c4c1