Merge branch 'v4-dev' into rip-custom

diff --cc scss/bootstrap-grid.scss
index f3699bc15de967a80d8a857cc5f63c2596c2dda2,722856c05cdbe837655dcc1b3fc2dcba4d935e69..4b2bddd5d3d739fbb4691cf8735a1be3f57f930b
--- 1/scss/bootstrap-grid.scss
--- 2/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@@ -22,6 -22,8 +22,7 @@@ html 
    box-sizing: inherit;
  }
  
 -@import "custom";
+ @import "functions";
  @import "variables";
  
  //

diff --cc scss/bootstrap-reboot.scss
index cdf59ab685bf223a732f07b64f18357cb5ff52c8,5965022a99665a16d1e6fac92ebfc1df48da52ce..2700a570560427f23c6868debda5572b05ff9a7f
--- 1/scss/bootstrap-reboot.scss
--- 2/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@@ -2,6 -2,8 +2,7 @@@
  //
  // Includes only Normalize and our custom Reboot reset.
  
 -@import "custom";
+ @import "functions";
  @import "variables";
  @import "mixins";
  

diff --cc scss/bootstrap.scss
index 9ab2210b319565238bf90e4243641e4683e248fe,239d062cf6bbf2b6e24411486736ea385cbfb666..131d9b63df655a73479778fc74536fcb59cfd4b4
--- 1/scss/bootstrap.scss
--- 2/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@@ -5,13 -5,11 +5,10 @@@
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
   */
  
- // Core variables and mixins
 -@import "custom";
+ @import "functions";
  @import "variables";
  @import "mixins";
- 
  @import "print";
- 
- // Core CSS
  @import "reboot";
  @import "type";
  @import "images";