From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 18 Apr 2016 13:27:16 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.21'
X-Git-Tag: v1.5.21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1eb2c1f7bd28a180d53f8fbe806f63f821439729;p=WP-Themes%2Fmcgulpinpoint.git

Merge branch 'hotfix/1.5.21'
---

ea5854426feca8f31afb7aa5e7d669316250c905