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

Merge branch 'hotfix/1.2.35'
---

5a164bdef213acb4b0ea0c09b60d471a5d7a529c