From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 4 Feb 2016 19:29:26 +0000 (-0500)
Subject: Merge branch 'hotfix/1.0.18'
X-Git-Tag: v1.0.18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=198e4ac7ef6ac398853d38ada252947288cad241;p=WP-Themes%2Fstaffords.git

Merge branch 'hotfix/1.0.18'
---

301caac014d8ac424b94d79e1cd7b9d7d80de224