From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 14 Jun 2017 16:43:55 +0000 (-0400)
Subject: Merge tag 'v1.2.14' into develop
X-Git-Tag: v1.2.15^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=72550fa07b00c9f45ed6a542e1fe0462090c5d51;p=web%2FTroutCreek.git

Merge tag 'v1.2.14' into develop

Version 1.2.14
---

72550fa07b00c9f45ed6a542e1fe0462090c5d51