fix bug where columns would have more margin than row with bigger gutters
Merge branch 'develop' into page