From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 18 Dec 2017 16:25:08 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.21'
X-Git-Tag: v1.0.21^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d83fcf58551a1e19e8e013e9e88c87a0d2cfadd2;p=WP-Themes%2Fmackinawferry.git

Merge branch 'hotfix/1.0.21'
---

d83fcf58551a1e19e8e013e9e88c87a0d2cfadd2