From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 May 2017 17:11: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=12bdf69018d1c91bd265d0f2efcd1a0c20f5e352;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.21'
---

69a54807d0bd5822358f8812821fb267cf925278