From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 3 Aug 2015 16:38:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.6' into develop
X-Git-Tag: v1.3.7^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=a933d01eb943734235d6f37c6d207f9b480a5afe;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.6' into develop
---

a933d01eb943734235d6f37c6d207f9b480a5afe