From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 8 Jan 2016 19:33:52 +0000 (-0500)
Subject: Merge branch 'hotfix/1.3.13'
X-Git-Tag: v1.3.13^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6bf52d943198670703cd5367a4d2dd7834c01c75;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.13'
---

6bf52d943198670703cd5367a4d2dd7834c01c75