From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 24 May 2016 15:50:56 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.6'
X-Git-Tag: v1.0.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=516a3f0272c250340cc139ab88e66a2249b09eab;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.6'
---

516a3f0272c250340cc139ab88e66a2249b09eab