From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 4 Mar 2016 14:10:01 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: V1.1.7
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d1756e94a6ba1223d3b5947eb73e1bd3882b0a38;p=WP-Themes%2FEMSEmmet.git

Merge branch 'hotfix/1.1.7'
---

c7150f1b0af3a1970c384a0f505e1f3fdab84e1f