Merge pull request #9365 from andycochran/blockgrid

add block-grid-column so bottom margin matches gutters

diff --cc scss/grid/_classes.scss
index bb15aa03cc7cd2dd85343d1ef4056ce137e72f2c,55cda3e865f15871b18d76442bfd0093148d7193..431e9134847d2ae0a4d5fac98724a02ede588bb2
--- 1/scss/grid/_classes.scss
--- 2/scss/grid/_classes.scss
+++ b/scss/grid/_classes.scss
@@@ -154,9 -155,14 +155,14 @@@
      }
    }
  
+   // Block grid columns
+   .#{$column}-#{$block} {
+     @include grid-column-margin;
+   }
+ 
    @if $column == 'column' {
      .columns {
 -      // scss-lint:disable PlaceholderInExtend
 +      // sass-lint:disable-block placeholder-in-extend
        @extend .column;
      }
    }

diff --cc scss/grid/_gutter.scss
Simple merge