Merge changes from Zurb Foundation