From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 18 May 2017 20:54:49 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6375250198f9af5c00b84d4dbf421f92b3df463d;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.17'
---

2052065106f559c4891e0ae3b5df47519dc720c7