From: Chris Oyler <chris@zurb.com>
Date: Wed, 27 Jan 2016 23:54:07 +0000 (-0800)
Subject: Merge pull request #7997 from IAmEddieDean/chris-dev
X-Git-Tag: v6.2.1~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b86232de22009dba55d8b301b7f4e6cc4e71736f;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge pull request #7997 from IAmEddieDean/chris-dev

fixes PART of #7969
---

b86232de22009dba55d8b301b7f4e6cc4e71736f