From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 28 Dec 2016 16:58:27 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.8'
X-Git-Tag: v1.1.8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8d20f4d8aabcfb85c80373cd92cf5836275bdde8;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.8'
---

e9dd69ace49e6f4abb267cea8724200c5795cf29