Merge branch 'chore/upgrade-dependencies' into v2.3

diff --cc docs/pages/grid.md
index f072f5367d8c30940f89b466495281c49ccc03cf,42e9524e30b3c119f4312edc414757f8e1c6dd8c..77d0bbf239c1e483c11a41a3145cae8443babf58
--- 1/docs/pages/grid.md
--- 2/docs/pages/grid.md
+++ b/docs/pages/grid.md
@@@ -95,12 -95,10 +95,12 @@@ The `.expander` prevents a rendering bu
  
  Collapsing a row removes the gutters from every column, which is the spacing between them. Add the class `.collapse` to a row to enable this.
  
 +There are more utility classes that you can use to isolate and collapse portions of your layouts: `.collapse-top` `.collapse-bottom` `.collapse-left` `.collapse-right` `.collapse-border` `.collapse-gutter`
 +
  ```inky_example
  <row class="collapse">
-   <columns large="6"><img src="http://placehold.it/300x150/777777/&text=These columns touch" alt=""></columns>
-   <columns large="6"><img src="http://placehold.it/300x150/999999/&text=These columns touch" alt=""></columns>
+   <columns large="6"><img src="https://placehold.it/300x150/777777/&text=These columns touch" alt=""></columns>
+   <columns large="6"><img src="https://placehold.it/300x150/999999/&text=These columns touch" alt=""></columns>
  </row>
  ```
  

diff --cc docs/pages/tips-tricks.md
Simple merge

diff --cc gulpfile.js
Simple merge

diff --cc scss/components/_media-query.scss
index 206bd2d106b39366672314ea95274b08b845bf30,983df61b7df012f8cea3b41ff6c8e0c200c3aeee..06f3840067f73db8db227ce972138b3841637966
--- 1/scss/components/_media-query.scss
--- 2/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@@ -25,9 -25,11 +25,9 @@@
    table.body .columns,
    table.body .column {
      height: auto !important;
 -    -moz-box-sizing: border-box;
 -    -webkit-box-sizing: border-box;
      box-sizing: border-box;
-     padding-left: $global-gutter !important;
-     padding-right: $global-gutter !important;
+     padding-left: $global-gutter-small !important;
+     padding-right: $global-gutter-small !important;
  
      // Nested columns won't double the padding
      .column,

diff --cc scss/components/_normalize.scss
Simple merge

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