From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 31 Aug 2016 13:28:18 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.2'
X-Git-Tag: v1.5.2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d41eafafd50db7d04fe8b026be0721b33c648ead;p=web%2FKeweenaw.git

Merge branch 'hotfix/1.5.2'
---

1644e138aa4099c34ea98ad7b09e6216a3f1fdac