From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 7 Sep 2018 16:58:50 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f1c9e3b20296e68bc5add4f60ea51c5c4b40aaf4;p=WP-Themes%2Ftroutcreek.git

Merge branch 'hotfix/1.0.17'
---

c61d01423a7b0698d4338962a558f38a640de10c