From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 25 May 2017 18:06:35 +0000 (-0400)
Subject: Merge branch 'release/1.2.13'
X-Git-Tag: v1.2.13^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=e734c97e17e3a1995b1379e6cc6f7ca94b7b3e7a;p=web%2FTroutCreek.git

Merge branch 'release/1.2.13'
---

e734c97e17e3a1995b1379e6cc6f7ca94b7b3e7a