From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 21 Aug 2014 14:39:33 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.20'
X-Git-Tag: V1.0.20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8229b3018227538354531e50a2a27371631e7ff6;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.20'
---

860f61375e182ceabe3e50bda4a3a42b83ecf626