From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 24 Oct 2016 15:38:36 +0000 (-0400)
Subject: Merge branch 'hotfix/1.2.2'
X-Git-Tag: v1.2.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f8c78b7c3c0cd9e485a1e7532e3154bbd5638cdf;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.2.2'
---

f8c78b7c3c0cd9e485a1e7532e3154bbd5638cdf