Merge branch 'master' into develop

diff --cc js/foundation.tabs.js
index 16b53e242b0f04ea7a1b4259d41c8c8cbafe2bcc,8ac3fd8cb360c625c50b516711d50c8e348a1c87..b27ec8158e3f5abe51f637210df305fe41e5bf38
--- 1/js/foundation.tabs.js
--- 2/js/foundation.tabs.js
+++ b/js/foundation.tabs.js
@@@ -76,8 -76,8 +76,7 @@@ class Tabs 
            });
          });
        }
 -
      });
- 
      if(this.options.matchHeight) {
        var $images = this.$tabContent.find('img');
  

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