From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 7 Jul 2016 14:21:26 +0000 (-0400)
Subject: Merge tag 'v1.0.17' into develop
X-Git-Tag: v1.1.0^2~14
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ec7da04c1e488285c062707e8bc0ae249ec4abce;p=WP-Themes%2Fwesternup.git

Merge tag 'v1.0.17' into develop

v1.0.17
---

ec7da04c1e488285c062707e8bc0ae249ec4abce