From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 17 Jan 2017 21:01:09 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.8'
X-Git-Tag: v1.0.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=39418ed291462ea8796f8ac049fd3917d2ff5af0;p=web%2FCedarvilleMarine.git

Merge branch 'hotfix/1.0.8'
---

459a7ebe14d91d7e541940ea679ee026435c6020