Merge remote-tracking branch 'upstream/develop' into develop

diff --cc js/foundation.offcanvas.js
index 621a2ff4a49bd2dc86aee21b96622bcc18acee11,924675efa49cb36351192fe922cb0988ce0d1add..00f4731330ad31688d75bc6068eeb006a78fc91b
--- 1/js/foundation.offcanvas.js
--- 2/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@@ -27,24 -27,12 +27,25 @@@ class OffCanvas extends Plugin 
    _setup(element, options) {
      this.$element = element;
      this.options = $.extend({}, OffCanvas.defaults, this.$element.data(), options);
 +    this.contentClasses = [];
      this.$lastTrigger = $();
      this.$triggers = $();
 +    this.position = 'left';
 +    this.$content = $();
 +    this.nested = !!(this.options.nested);
  
 -    //Triggers init is idempotent, just need to make sure it is initialized
 +    // Defines the CSS transition/position classes of the off-canvas content container.
 +    $(['push', 'overlap']).each((index, val) => {
 +      this.contentClasses.push('has-transition-'+val);
 +    });
 +    $(['left', 'right', 'top', 'bottom']).each((index, val) => {
 +      this.contentClasses.push('has-position-'+val);
 +      this.contentClasses.push('has-reveal-'+val);
 +    });
 +
 +    // Triggers init is idempotent, just need to make sure it is initialized
      Triggers.init($);
+     MediaQuery._init();
  
      this._init();
      this._events();

diff --cc scss/settings/_settings.scss
Simple merge