From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 27 Dec 2016 20:43:40 +0000 (-0500)
Subject: Merge branch 'hotfix/1.2.36'
X-Git-Tag: v1.2.36
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e1b8fb21f666e2b85205c19d9a35b89ce74b76cb;p=WP-Themes%2Fgilmoremuseum.git

Merge branch 'hotfix/1.2.36'
---

568a21208c3c526e14d23fd5143171983b6ed225