From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 23 May 2017 17:53:03 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.22'
X-Git-Tag: v1.0.22
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e56f9d4aceface20dbbb2ee96157036ec5497e55;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.22'
---

c6c6b022c41d005fb7d4f128b53f94d3e2c509f3