From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Dec 2016 14:54:28 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.6'
X-Git-Tag: v1.2.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5b42c86499aaf3ed1879fcdd5b720d32bf0520ef;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.6'
---

766b76e140815677ac365aabac89dbaecf5c3620