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
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=132e282400e157c553221009a501d6f1e503d6d9;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.8'
---

f88768ed5490c608ffdee822617b7c7b66149743