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

Merge tag 'v1.2.11' into develop

Version 1.2.11
---

a664034ce35138d280e9fe766b8fee100c16b517