From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 2 Nov 2015 21:19:15 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.13'
X-Git-Tag: v1.0.13^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9b12126ba8f39d2f60c77b35fc281a53d1cea568;p=web%2FTroutCreek.git

Merge branch 'hotfix/1.0.13'
---

9b12126ba8f39d2f60c77b35fc281a53d1cea568