From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 11 Jul 2017 17:17:44 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.23'
X-Git-Tag: v1.0.23
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2f9d368bce56ea1447550bc8c164f89a2bc6987b;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.23'
---

1a7df5b27ec8efdf231d15cc7bd5340cde729b9e