Merge 6.2-flex into 6.2

diff --cc docs/assets/scss/docs.scss
index ff22c4275050c00b0cffdb95fa39b3463b8b0125,c3fdc61f2c14c8e2b6eae6b0ef40719457392bb6..3a86c9295fd0ce0a17a714e9ea3c5f08a90de757
--- 1/docs/assets/scss/docs.scss
--- 2/docs/assets/scss/docs.scss
+++ b/docs/assets/scss/docs.scss
@@@ -11,10 -11,10 +11,13 @@@
  @import 'foundation';
  @import 'motion-ui';
  
+ $-zf-flex-classes-imported: true;
+ 
  @include foundation-everything;
+ @include foundation-flex-classes;
 +@include foundation-range-input;
 +@include foundation-progress-element;
 +@include foundation-meter-element;
  @include motion-ui-transitions;
  
  @import 'foundation-docs';

diff --cc scss/_global.scss
Simple merge