From: Ian Weller <ian@gaslightmedia.com>
Date: Wed, 1 Feb 2017 14:10:06 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.16'
X-Git-Tag: v1.0.16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ae60140381df8863261f3e137423cf9f4a4de61f;p=WP-Themes%2Fshipwreckmuseum.git

Merge branch 'hotfix/1.0.16'
---

410d26bf4ccb83c7b7d7c7d581d03608e7168dac