From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Dec 2016 14:54:34 +0000 (-0500)
Subject: Merge tag 'v1.2.6' into develop
X-Git-Tag: v1.2.8^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f38dcc3da4b7ba5ccb98df5ea35105487f498479;p=web%2FTroutCreek.git

Merge tag 'v1.2.6' into develop

Version 1.2.6
---

f38dcc3da4b7ba5ccb98df5ea35105487f498479