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

Merge branch 'hotfix/1.0.20'
---

30295c6caa774c15f60ea81ff01d87de9852847d