From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 23 May 2017 14:49:09 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=17329b5c2ce9f52a433c80382f2dc1526cd1b518;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.18'
---

90057ed3a0ace623b2890259723a575ccd3aece0