Closes #2135
Merge branch 'master' of github.com:zurb/foundation