From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Jan 2016 20:42:58 +0000 (-0500)
Subject: Merge branch 'hotfix/1.3.11'
X-Git-Tag: v1.3.11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=11a8762ea0afb5ffbcf495642915e5a993e00eb5;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.3.11'
---

a1725927909c4a04b144f9c7a6daee0327a89a98