From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Jan 2016 19:54:23 +0000 (-0500)
Subject: Merge branch 'hotfix/1.3.10'
X-Git-Tag: v1.3.10
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e5d32809a225ed659c48f0174a207853cce4e46c;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.10'
---

31798d614d0eff147b89eeadf9cd820ecc6f7241