From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 7 Jul 2016 14:21:21 +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=ada99a35f534c544029e89d34feed03ac9643670;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.17'
---

8c0a45dd65a413f92274bb4a5b74627cf3545551