From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 2 Nov 2016 15:47:24 +0000 (-0400)
Subject: Merge branch 'hotfix/1.0.16'
X-Git-Tag: v1.0.16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c44e2636f937549b88cc66b710428dcc97f049e2;p=WP-Themes%2Ffrancejourneys.git

Merge branch 'hotfix/1.0.16'
---

e26e6a3dab66e937a7150dc603e684e3c0e180f2