From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Dec 2016 20:58:45 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.7'
X-Git-Tag: v1.2.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d260d50936d3e804db6fcb0bb316bac6d9ec2021;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.7'
---

f84b2bca1ec99858b708cedbb71424b14aa6736e