From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 May 2017 17:37:25 +0000 (-0400)
Subject: Merge tag 'v1.2.12' into develop
X-Git-Tag: v1.2.13^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e20d8b29660e77545fa7de9e081ad4c87e16f980;p=web%2FTroutCreek.git

Merge tag 'v1.2.12' into develop

Version 1.2.12
---

e20d8b29660e77545fa7de9e081ad4c87e16f980