From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Jun 2016 13:27:19 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.7'
X-Git-Tag: v1.0.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6e6e3f4f1297bfb2784f1b3b22ec2386200edd24;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.7'
---

6e6e3f4f1297bfb2784f1b3b22ec2386200edd24