From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 5 Dec 2016 16:30:20 +0000 (-0500)
Subject: Merge branch 'release/1.2.4'
X-Git-Tag: v1.2.4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0b46aa6daa336b01e80b966898056f2cc4a2f8b3;p=web%2FTroutCreek.git

Merge branch 'release/1.2.4'
---

5c29ec652a5e937c31863471b9a3b96b53f652ed