From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 7 Oct 2016 18:52:47 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.17'
X-Git-Tag: v1.0.17
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=05deba0c045eb915c179d6bc540ba0a7ca6da61d;p=WP-Themes%2Fbpla.git

Merge branch 'hotfix/1.0.17'
---

31414ded461d96242a7375dac54abc2158f3ad23