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

diff --cc docs/pages/off-canvas.md
Simple merge

diff --cc js/foundation.offcanvas.js
index 0a35104b54b150748ecffa230bb50b76c63650a0,6716daf2f475676fa97a99784e4999847163e2d4..6544c27fb0ee8e4038b31543119328fb95ad23de
--- 1/js/foundation.offcanvas.js
--- 2/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@@ -30,12 -29,10 +29,15 @@@ class OffCanvas extends Plugin 
      this.options = $.extend({}, OffCanvas.defaults, this.$element.data(), options);
      this.$lastTrigger = $();
      this.$triggers = $();
 +    this.position = 'left';
 +    this.$content = $();
 +    this.nested = !!(this.options.nested);
 +    this.$relativeParent;
 +    this.relativeScope = false;
  
+     //Triggers init is idempotent, just need to make sure it is initialized
+     Triggers.init($);
+ 
      this._init();
      this._events();
  

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

diff --cc scss/util/_mixins.scss
Simple merge