From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 20 Aug 2014 19:31:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.16'
X-Git-Tag: v1.0.16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=68557df925fa910772207bf3732bc50d13679858;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.0.16'
---

7bf986c5abdfd853f7abd5f25cd5e594cfa15150