From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Mon, 31 Oct 2016 18:59:27 +0000 (-0400)
Subject: Merge branch 'hotfix/1.1.17'
X-Git-Tag: v1.1.17^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=15e181de484f7749590fc7d8a92b06b826bda35e;p=WP-Themes%2FEMSEmmet.git

Merge branch 'hotfix/1.1.17'
---

15e181de484f7749590fc7d8a92b06b826bda35e