Refer PR#3013

https://github.com/zurb/foundation/pull/3013 is being redone as per current code base