Merge branch 'master' into develop

diff --cc docs/pages/flex-grid.md
index fdd88d4b339ea447fe08590f17970ca5ef4aa544,6d5f6ca52571be3d2051d89f9d85e80ede383638..161c23e7daecbc0d58a07a5fce0cd4526c82f5d2
--- 1/docs/pages/flex-grid.md
--- 2/docs/pages/flex-grid.md
+++ b/docs/pages/flex-grid.md
@@@ -242,15 -242,13 +242,15 @@@ The `.collapse` class lets you remove c
  
  There are times when you won't want each media query to be collapsed or uncollapsed. In this case, use the media query size you want and collapse or uncollapse and add that to your row element. Example shows no gutter at small media size and then adds the gutter to columns at medium.
  
 +The `.is-collapse-child` class removes negative margins from nested row under collapsed parent.
 +
  ```html
- <div class="row medium-uncollapse large-collapse">
+ <div class="row small-collapse medium-uncollapse">
    <div class="small-6 columns">
-     Removes gutter at large media query
+     Removes gutter at small media query and adds at medium.
    </div>
    <div class="small-6 columns">
-     Removes gutter at large media query
+     Removes gutter at small media query and adds at medium.
    </div>
  </div>
  ```