From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 2 Feb 2017 19:36:55 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.2'
X-Git-Tag: v1.0.2^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=752221cb9b0f92b2851520b9c2cedc3b1d35f323;p=WP-Themes%2Fpistontech.git

Merge branch 'hotfix/1.0.2'
---

752221cb9b0f92b2851520b9c2cedc3b1d35f323