From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 4 Nov 2016 15:05:55 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.6'
X-Git-Tag: v1.1.6^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d8d356daec80368217798f31092842bfe819d1c3;p=WP-Themes%2Fjollylama.git

Merge branch 'hotfix/1.1.6'
---

d8d356daec80368217798f31092842bfe819d1c3