From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 3 Feb 2017 19:12:23 +0000 (-0500)
Subject: Merge branch 'hotfix/1.5.4'
X-Git-Tag: v1.5.4^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f0439f9f4e7ede806f3cdb2ee98520b75aa87ef0;p=WP-Plugins%2Fglm-blocks.git

Merge branch 'hotfix/1.5.4'
---

f0439f9f4e7ede806f3cdb2ee98520b75aa87ef0