Fixes grid gutter size calculation problem.
Merging.