From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 14 Jul 2015 13:56:54 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.5' into develop
X-Git-Tag: v1.3.7^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=652ab8e70dd7c78f67677a54d1479062dcbd828d;p=web%2FKeweenaw.git

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

652ab8e70dd7c78f67677a54d1479062dcbd828d