From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 2 Feb 2017 15:10:52 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.5'
X-Git-Tag: v1.1.5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=460ccd5093597e2e08fa53a32918c43b9ac1f06b;p=WP-Themes%2Fwesternup.git

Merge branch 'hotfix/1.1.5'
---

20fbbbbabc02bf81b77a9789d8d141c59e5992bc