From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 14 Jun 2017 16:43:46 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.14'
X-Git-Tag: v1.2.14^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8fff1758e333c60d19e6f7f4df2c29df35c060d3;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.14'
---

8fff1758e333c60d19e6f7f4df2c29df35c060d3