From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 8 Jul 2016 18:08:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f64987730be0c758ec285727ad894180791e63ba;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.0.21'
---

e341a248bc2b9f19b23aabd721329121cd1c0f52