From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Oct 2015 13:08:41 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.6'
X-Git-Tag: V1.3.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6af681ed850853ba368c87d4724e59074e6f92e0;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.6'
---

aa3ab5418b92e2e366c1e57deafee2e2ba7622f1