From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 14 Jun 2017 18:50:50 +0000 (-0400)
Subject: Merge branch 'release/1.2.15'
X-Git-Tag: v1.2.15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0aa3e3d8736fd64cde1ba2b4f95ab14f80b52d5d;p=web%2FTroutCreek.git

Merge branch 'release/1.2.15'
---

381ed8351d38fa17f78859f4d20e650a8a7aaeff