From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 5 Dec 2016 16:30:27 +0000 (-0500)
Subject: Merge tag 'v1.2.4' into develop
X-Git-Tag: v1.2.5^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=191a7a7313c88dc950337082367bf2f2fbbd06df;p=web%2FTroutCreek.git

Merge tag 'v1.2.4' into develop

Version 1.2.4
---

191a7a7313c88dc950337082367bf2f2fbbd06df