From: Ian Weller <ian@gaslightmedia.com>
Date: Thu, 18 Aug 2016 19:36:22 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.18'
X-Git-Tag: v1.1.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7222ccf58fe6ae8e0df564dc4dbbc092df5dfdfd;p=WP-Themes%2FDarkSkiesEmmet.git

Merge branch 'hotfix/1.1.18'
---

18d055ae7094ae0c2b74b1385b1fcf20c0c99195