From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 23 Oct 2015 18:21:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.8'
X-Git-Tag: V1.3.8^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f88768ed5490c608ffdee822617b7c7b66149743;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.8'
---

f88768ed5490c608ffdee822617b7c7b66149743