From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 5 Nov 2015 21:39:31 +0000 (-0500)
Subject: Merge tag 'v1.0.17' into develop
X-Git-Tag: v1.0.35^2~17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=98baf875214ce29191548c5c60581d1f4c6a07bd;p=web%2FTroutCreek.git

Merge tag 'v1.0.17' into develop

Version 1.0.17
---

98baf875214ce29191548c5c60581d1f4c6a07bd