From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 31 Oct 2016 19:24:46 +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=3efabad8e01ff5271c94fe41056d4643e8bfb82e;p=WP-Themes%2FEMSEmmet.git

Merge branch 'hotfix/1.1.18'
---

ec2dbdb198227db1fbe2354b7eeec4957efac206