From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 5 Jun 2015 15:57:20 +0000 (-0400)
Subject: Merge branch 'hotfix/1.3.1'
X-Git-Tag: V1.3.1^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=4c3b022e71c37d0a52160b1ed64c45fea9816b56;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.1'
---

4c3b022e71c37d0a52160b1ed64c45fea9816b56