fix bug with grid and gutter type 'fixed'
Merge branch 'develop'