From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 13 Feb 2017 20:51:52 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.7'
X-Git-Tag: v1.1.7^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f0d57d5854689c4448bb761ebf07014f598cf2d4;p=WP-Themes%2FRecycleEmmet.git

Merge branch 'hotfix/1.1.7'
---

f0d57d5854689c4448bb761ebf07014f598cf2d4