From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 11 May 2017 15:42:41 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.6'
X-Git-Tag: v1.1.6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f9394fcbdd12c6630bca586d0293b36ddede50d4;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.1.6'
---

21430da14eab3575964ac681514aabed2c6b7e1f