From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Jan 2016 21:15:32 +0000 (-0500)
Subject: Merge branch 'hotfix/1.3.12'
X-Git-Tag: v1.3.12^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0577d1b63a990de77d6f339f89fe62a15ddc4668;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.12'
---

0577d1b63a990de77d6f339f89fe62a15ddc4668