From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 1 Apr 2016 20:49:34 +0000 (-0400)
Subject: Merge branch 'hotfix/1.5.18'
X-Git-Tag: v1.5.18^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=89d20650f8cf849a6741199674e372966728aa5b;p=WP-Themes%2Fmcgulpinpoint.git

Merge branch 'hotfix/1.5.18'
---

89d20650f8cf849a6741199674e372966728aa5b