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

Merge branch 'hotfix/1.2.1'
---

6a04b1a8ab60d99ebb0b675f12b02d05a74747bb