diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8c6f5e60a94..10e79b234d7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -109,11 +109,11 @@ See [`bench/README.md`](https://github.com/mapbox/mapbox-gl-js/blob/master/bench
   * Classes
   * Template strings
   * Computed and shorthand object properties
-* The following ES6 features are not to be used, in order to maintain support for Node 4.x, IE 11, and older mobile browsers. This may change in the future.
   * Default parameters
   * Rest parameters
-  * Spread (`...`) operator
   * Destructuring
+* The following ES6 features are not to be used, in order to maintain support for IE 11 and older mobile browsers. This may change in the future.
+  * Spread (`...`) operator (because it requires Object.assign)
   * Iterators and generators
   * "Library" features such as `Map`, `Set`, `array.find`, etc.
   * Modules
diff --git a/bench/benchmarks_view.js b/bench/benchmarks_view.js
index b8f57b1e0c0..3aaa4c3de0a 100644
--- a/bench/benchmarks_view.js
+++ b/bench/benchmarks_view.js
@@ -12,58 +12,55 @@ const BenchmarksView = React.createClass({
 
     render: function() {
         return <div style={{width: 960, paddingBottom: window.innerHeight, margin: '0 auto'}}>
-            {this.renderSidebarBenchmarks()}
-            {this.renderBenchmarks()}
-        </div>;
-    },
-
-    renderSidebarBenchmarks: function() {
-        return <div style={{paddingTop: 40, width: 280, position: 'fixed'}} className='text-right'>
-            <h1 className="space-bottom">Benchmarks</h1>
-            <div className="space-bottom small">
-                {Object.keys(this.state.results).map(this.renderSidebarBenchmark)}
-            </div>
-            <a
+            <h1 className="space-bottom">
+                Benchmarks
+                <a
                     className={[
+                        'fr',
                         'icon',
                         'clipboard',
                         'button',
                         (this.getStatus() === 'ended' ? '' : 'disabled')
                     ].join(' ')}
                     data-clipboard-text={this.renderTextBenchmarks()}>
-                Copy Results
-            </a>
+                    Copy Results
+                </a>
+            </h1>
+            <table>
+                <thead>
+                <tr>
+                    <th>Benchmark</th>
+                    {this.versions().map((v) => <th key={v}>{v}</th>)}
+                </tr>
+                </thead>
+                <tbody>
+                    {Object.keys(this.state.results).map(this.renderBenchmark)}
+                </tbody>
+            </table>
         </div>;
     },
 
-    renderSidebarBenchmark: function(name) {
-        return <div
-                key={name}
-                className={[
-                    'space-bottom',
-                    this.getBenchmarkStatus(name) === 'waiting' ? 'quiet' : ''
-                ].join(' ')}>
-            <h3>{name}</h3>
-            {Object.keys(this.state.results[name]).map(this.renderSidebarBenchmarkVersion.bind(this, name))}
-        </div>;
+    renderBenchmark: function(name) {
+        return <tr key={name}>
+            <th><a href={`#${name}`} onClick={this.reload}>{name}</a></th>
+            {Object.keys(this.state.results[name]).map(this.renderBenchmarkVersion.bind(this, name))}
+        </tr>;
     },
 
-    renderSidebarBenchmarkVersion: function(name, version) {
+    renderBenchmarkVersion: function(name, version) {
         const results = this.state.results[name][version];
-        const that = this;
-
-        return <div
-                onClick={function() {
-                    that.scrollToBenchmark(name, version);
-                }}
-                style={{cursor: 'pointer'}}
+        return (
+            <td id={name + version}
                 key={version}
                 className={results.status === 'waiting' ? 'quiet' : ''}>
-            <strong>{version}:</strong> {results.message || '...'}
-        </div>;
+                {results.logs.map((log, index) => {
+                    return <div key={index} className={`pad1 dark fill-${log.color}`}>{log.message}</div>;
+                })}
+            </td>
+        );
     },
 
-    renderTextBenchmarks: function() {
+    versions: function() {
         const versions = [];
         for (const name in this.state.results) {
             for (const version in this.state.results[name]) {
@@ -72,7 +69,11 @@ const BenchmarksView = React.createClass({
                 }
             }
         }
+        return versions;
+    },
 
+    renderTextBenchmarks: function() {
+        const versions = this.versions();
         let output = `benchmark | ${versions.join(' | ')}\n---`;
         for (let i = 0; i < versions.length; i++) {
             output += ' | ---';
@@ -90,49 +91,6 @@ const BenchmarksView = React.createClass({
         return output;
     },
 
-    renderBenchmarks: function() {
-        return <div style={{width: 590, marginLeft: 320, marginBottom: 60}}>
-            {Object.keys(this.state.results).map(this.renderBenchmark)}
-        </div>;
-    },
-
-    renderBenchmark: function(name) {
-        return <div key={name}>
-            {Object.keys(this.state.results[name]).map(this.renderBenchmarkVersion.bind(this, name))}
-        </div>;
-    },
-
-    renderBenchmarkVersion: function(name, version) {
-        const results = this.state.results[name][version];
-        return (
-                <div
-                    style={{paddingTop: 40}}
-                    id={name + version}
-                    key={version}
-                    className={results.status === 'waiting' ? 'quiet' : ''}>
-
-                    <h2 className='space-bottom'>{name} on {version}</h2>
-                {results.logs.map((log, index) => {
-                    return <div key={index} className={`pad1 dark fill-${log.color}`}>{log.message}</div>;
-                })}
-            </div>
-        );
-    },
-
-    scrollToBenchmark: function(name, version) {
-        const duration = 300;
-        const startTime = (new Date()).getTime();
-        const startYOffset = window.pageYOffset;
-
-        requestAnimationFrame(function frame() {
-            const endYOffset = document.getElementById(name + version).offsetTop;
-            const time = (new Date()).getTime();
-            const yOffset = Math.min((time - startTime) / duration, 1) * (endYOffset - startYOffset) + startYOffset;
-            window.scrollTo(0, yOffset);
-            if (time < startTime + duration) requestAnimationFrame(frame);
-        });
-    },
-
     getInitialState: function() {
         const results = {};
 
@@ -156,7 +114,6 @@ const BenchmarksView = React.createClass({
 
         asyncSeries(Object.keys(that.state.results), (name, callback) => {
             asyncSeries(Object.keys(that.state.results[name]), (version, callback) => {
-                that.scrollToBenchmark(name, version);
                 that.runBenchmark(name, version, callback);
             }, callback);
         }, (err) => {
@@ -181,7 +138,6 @@ const BenchmarksView = React.createClass({
         }
 
         results.status = 'running';
-        this.scrollToBenchmark(name, version);
         log('dark', 'starting');
 
         setTimeout(() => {
@@ -223,6 +179,10 @@ const BenchmarksView = React.createClass({
         return reduceStatuses(Object.keys(this.state.results).map(function(name) {
             return this.getBenchmarkStatus(name);
         }, this));
+    },
+
+    reload() {
+        location.reload();
     }
 });
 
diff --git a/debug/canvas.html b/debug/canvas.html
new file mode 100644
index 00000000000..3b2a0087df6
--- /dev/null
+++ b/debug/canvas.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Mapbox GL JS debug page</title>
+    <meta charset='utf-8'>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <link rel='stylesheet' href='/dist/mapbox-gl.css' />
+    <style>
+        body { margin: 0; padding: 0; }
+        html, body, #map { height: 100%; }
+    </style>
+</head>
+
+<body>
+<canvas id="testCanvasID" width="200" height="100"
+style="border:10px solid blue;">
+Canvas not supported
+</canvas>
+<div id='map'></div>
+
+<script type="application/javascript">
+function drawToCanvas() {
+    var canvas = document.getElementById('testCanvasID');
+    if (canvas.getContext) {
+        var ctx = canvas.getContext('2d');
+
+        ctx.fillStyle = 'rgb(200, 0, 0)';
+        ctx.fillRect(10, 10, 50, 50);
+
+        ctx.fillStyle = 'rgba(0, 0, 200, 0.5)';
+        ctx.fillRect(30, 30, 50, 50);
+    }
+}
+</script>
+<script src='/dist/mapbox-gl-dev.js'></script>
+<script src='/debug/access_token_generated.js'></script>
+<script>
+
+var canvasStyle = {
+    "version": 8,
+    "sources": {
+        "canvas": {
+            "type": "canvas",
+            "canvas": "testCanvasID",
+            "coordinates": [
+                [-122.51596391201019, 37.56238816766053],
+                [-122.51467645168304, 37.56410183312965],
+                [-122.51309394836426, 37.563391708549425],
+                [-122.51423120498657, 37.56161849366671]
+            ]
+        }
+    },
+    "layers": [{
+        "id": "background",
+        "type": "background",
+        "paint": {
+            "background-color": "rgb(4,7,14)"
+        }
+    }, {
+        "id": "canvas",
+        "type": "raster",
+        "source": "canvas"
+    }]
+};
+
+var map = new mapboxgl.Map({
+    container: 'map',
+    minZoom: 14,
+    zoom: 17,
+    center: [-122.514426, 37.562984],
+    bearing: -96,
+    style: canvasStyle,
+    hash: false
+});
+
+drawToCanvas();
+
+</script>
+</body>
+</html>
diff --git a/dist/mapbox-gl.css b/dist/mapbox-gl.css
index efca2ec68cb..a0ffa2b937a 100644
--- a/dist/mapbox-gl.css
+++ b/dist/mapbox-gl.css
@@ -118,7 +118,7 @@ a.mapboxgl-ctrl-logo {
     display: block;
     background-repeat: no-repeat;
     cursor: pointer;
-    background-image: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"   viewBox="0 0 84.49 21" style="enable-background:new 0 0 84.49 21;" xml:space="preserve"><style type="text/css">  .st0{opacity:0.9;fill:#FFFFFF;enable-background:new    ;}  .st1{opacity:0.35;enable-background:new    ;}</style><g>  <path class="st0" d="M83.25,14.26c0,0.12-0.09,0.21-0.21,0.21h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39l-1.44,2.39    c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68L76.2,6.84    c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.4-2.35    c0.06-0.11,0.18-0.17,0.3-0.17H83c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.37,3.63l2.43,3.67    C83.24,14.18,83.25,14.22,83.25,14.26z"/>  <path class="st0" d="M66.24,9.59c-0.39-1.88-1.96-3.28-3.84-3.28c-1.03,0-2.03,0.42-2.73,1.18V3.51c0-0.13-0.1-0.23-0.23-0.23h-1.4    c-0.13,0-0.23,0.11-0.23,0.23v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.11,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.73,1.18    c1.88,0,3.45-1.41,3.84-3.29C66.37,10.79,66.37,10.18,66.24,9.59L66.24,9.59z M62.08,13c-1.32,0-2.39-1.11-2.41-2.48v-0.06    c0.02-1.38,1.09-2.48,2.41-2.48s2.42,1.12,2.42,2.51S63.41,13,62.08,13z"/>  <path class="st0" d="M71.67,6.32c-1.98-0.01-3.72,1.35-4.16,3.29c-0.13,0.59-0.13,1.19,0,1.77c0.44,1.94,2.17,3.32,4.17,3.3    c2.35,0,4.26-1.87,4.26-4.19S74.04,6.32,71.67,6.32z M71.65,13.01c-1.33,0-2.42-1.12-2.42-2.51s1.08-2.52,2.42-2.52    c1.33,0,2.42,1.12,2.42,2.51S72.99,13,71.65,13.01L71.65,13.01z"/>  <path class="st1" d="M62.08,7.98c-1.32,0-2.39,1.11-2.41,2.48v0.06C59.68,11.9,60.75,13,62.08,13s2.42-1.12,2.42-2.51    S63.41,7.98,62.08,7.98z M62.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25    c0.63,0,1.17,0.57,1.17,1.27C63.24,11.2,62.73,11.76,62.08,11.76z"/>  <path class="st1" d="M71.65,7.98c-1.33,0-2.42,1.12-2.42,2.51S70.32,13,71.65,13s2.42-1.12,2.42-2.51S72.99,7.98,71.65,7.98z     M71.65,11.76c-0.64,0-1.17-0.57-1.17-1.27c0-0.7,0.53-1.26,1.17-1.26s1.17,0.57,1.17,1.27C72.82,11.21,72.29,11.76,71.65,11.76z"    />  <path class="st0" d="M45.74,6.53h-1.4c-0.13,0-0.23,0.11-0.23,0.23v0.73c-0.71-0.75-1.7-1.18-2.73-1.18    c-2.17,0-3.94,1.87-3.94,4.19s1.77,4.19,3.94,4.19c1.04,0,2.03-0.43,2.73-1.19v0.73c0,0.13,0.1,0.23,0.23,0.23h1.4    c0.13,0,0.23-0.11,0.23-0.23V6.74c0-0.12-0.09-0.22-0.22-0.22C45.75,6.53,45.75,6.53,45.74,6.53z M44.12,10.53    C44.11,11.9,43.03,13,41.71,13s-2.42-1.12-2.42-2.51s1.08-2.52,2.4-2.52c1.33,0,2.39,1.11,2.41,2.48L44.12,10.53z"/>  <path class="st1" d="M41.71,7.98c-1.33,0-2.42,1.12-2.42,2.51S40.37,13,41.71,13s2.39-1.11,2.41-2.48v-0.06    C44.1,9.09,43.03,7.98,41.71,7.98z M40.55,10.49c0-0.7,0.52-1.27,1.17-1.27c0.64,0,1.14,0.56,1.17,1.25v0.04    c-0.01,0.68-0.53,1.24-1.17,1.24C41.08,11.75,40.55,11.19,40.55,10.49z"/>  <path class="st0" d="M52.41,6.32c-1.03,0-2.03,0.42-2.73,1.18V6.75c0-0.13-0.1-0.23-0.23-0.23h-1.4c-0.13,0-0.23,0.11-0.23,0.23    v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.1,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.74,1.18c2.17,0,3.94-1.87,3.94-4.19    S54.58,6.32,52.41,6.32z M52.08,13.01c-1.32,0-2.39-1.11-2.42-2.48v-0.07c0.02-1.38,1.09-2.49,2.4-2.49c1.32,0,2.41,1.12,2.41,2.51    S53.4,13,52.08,13.01L52.08,13.01z"/>  <path class="st1" d="M52.08,7.98c-1.32,0-2.39,1.11-2.42,2.48v0.06c0.03,1.38,1.1,2.48,2.42,2.48s2.41-1.12,2.41-2.51    S53.4,7.98,52.08,7.98z M52.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25c0.63,0,1.17,0.58,1.17,1.27    S52.72,11.76,52.08,11.76z"/>  <path class="st0" d="M36.08,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68c0-0.98-0.74-1.71-1.62-1.71    c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.11,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68    c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V6.74    c0.01-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03c1.09,0,2.09,0.6,2.6,1.55    c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78L36.08,14.24z"/>  <path class="st1" d="M84.34,13.59l-0.07-0.13l-1.96-2.99l1.94-2.95c0.44-0.67,0.26-1.56-0.41-2.02c-0.02,0-0.03,0-0.04-0.01    c-0.23-0.15-0.5-0.22-0.78-0.22h-1.61c-0.56,0-1.08,0.29-1.37,0.78L79.72,6.6l-0.34-0.56C79.09,5.56,78.57,5.27,78,5.27h-1.6    c-0.6,0-1.13,0.37-1.35,0.92c-2.19-1.66-5.28-1.47-7.26,0.45c-0.35,0.34-0.65,0.72-0.89,1.14c-0.9-1.62-2.58-2.72-4.5-2.72    c-0.5,0-1.01,0.07-1.48,0.23V3.51c0-0.82-0.66-1.48-1.47-1.48h-1.4c-0.81,0-1.47,0.66-1.47,1.47v3.75    c-0.95-1.36-2.5-2.18-4.17-2.19c-0.74,0-1.46,0.16-2.12,0.47c-0.24-0.17-0.54-0.26-0.84-0.26h-1.4c-0.45,0-0.87,0.21-1.15,0.56    c-0.02-0.03-0.04-0.05-0.07-0.08c-0.28-0.3-0.68-0.47-1.09-0.47h-1.39c-0.3,0-0.6,0.09-0.84,0.26c-0.67-0.3-1.39-0.46-2.12-0.46    c-1.83,0-3.43,1-4.37,2.5c-0.2-0.46-0.48-0.89-0.83-1.25c-0.8-0.81-1.89-1.25-3.02-1.25h-0.01c-0.89,0.01-1.75,0.33-2.46,0.88    c-0.74-0.57-1.64-0.88-2.57-0.88H28.1c-0.29,0-0.58,0.03-0.86,0.11c-0.28,0.06-0.56,0.16-0.82,0.28c-0.21-0.12-0.45-0.18-0.7-0.18    h-1.4c-0.82,0-1.47,0.66-1.47,1.47v7.5c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.48-0.66,1.48-1.48l0,0V9.79    c0.03-0.36,0.23-0.59,0.36-0.59c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41c0.82,0,1.47-0.66,1.47-1.47    l-0.01-4.57c0.06-0.32,0.25-0.47,0.35-0.47c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41    c0.82,0,1.47-0.66,1.47-1.47v-0.38c0.96,1.29,2.46,2.06,4.06,2.06c0.74,0,1.46-0.16,2.12-0.47c0.24,0.17,0.54,0.26,0.84,0.26h1.39    c0.3,0,0.6-0.09,0.84-0.26v2.01c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.47-0.66,1.47-1.47v-1.77c0.48,0.15,0.99,0.23,1.49,0.22    c1.7,0,3.22-0.87,4.17-2.2v0.52c0,0.82,0.66,1.47,1.47,1.47h1.4c0.3,0,0.6-0.09,0.84-0.26c0.66,0.31,1.39,0.47,2.12,0.47    c1.92,0,3.6-1.1,4.49-2.73c1.54,2.65,4.95,3.53,7.58,1.98c0.18-0.11,0.36-0.22,0.53-0.36c0.22,0.55,0.76,0.91,1.35,0.9H78    c0.56,0,1.08-0.29,1.37-0.78l0.37-0.61l0.37,0.61c0.29,0.48,0.81,0.78,1.38,0.78h1.6c0.81,0,1.46-0.66,1.45-1.46    C84.49,14.02,84.44,13.8,84.34,13.59L84.34,13.59z M35.86,14.47h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68    c0-0.98-0.74-1.71-1.62-1.71c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23    V9.68c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23    V6.74c0.01-0.13,0.11-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03    c1.09,0,2.09,0.6,2.6,1.55c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78l0.01,5.16C36.09,14.36,35.98,14.46,35.86,14.47    L35.86,14.47z M45.97,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V13.5c-0.7,0.76-1.69,1.18-2.72,1.18    c-2.17,0-3.94-1.87-3.94-4.19s1.77-4.19,3.94-4.19c1.03,0,2.02,0.43,2.73,1.18V6.74c0-0.13,0.1-0.23,0.23-0.23h1.4    c0.12-0.01,0.22,0.08,0.23,0.21c0,0.01,0,0.01,0,0.02v7.51h-0.01V14.24z M52.41,14.67c-1.03,0-2.02-0.43-2.73-1.18v3.97    c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.1-0.23-0.23V6.75c0-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.23,0.11,0.23,0.23v0.73    c0.71-0.76,1.7-1.18,2.73-1.18c2.17,0,3.94,1.86,3.94,4.18S54.58,14.67,52.41,14.67z M66.24,11.39c-0.39,1.87-1.96,3.29-3.84,3.29    c-1.03,0-2.02-0.43-2.73-1.18v0.73c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V3.51c0-0.13,0.1-0.23,0.23-0.23    h1.4c0.13,0,0.23,0.11,0.23,0.23v3.97c0.71-0.75,1.7-1.18,2.73-1.17c1.88,0,3.45,1.4,3.84,3.28C66.37,10.19,66.37,10.8,66.24,11.39    L66.24,11.39L66.24,11.39z M71.67,14.68c-2,0.01-3.73-1.35-4.17-3.3c-0.13-0.59-0.13-1.19,0-1.77c0.44-1.94,2.17-3.31,4.17-3.3    c2.36,0,4.26,1.87,4.26,4.19S74.03,14.68,71.67,14.68L71.67,14.68z M83.04,14.47h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39    l-1.44,2.39c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68    L76.2,6.84c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.41-2.36    c0.06-0.11,0.18-0.17,0.3-0.17h1.61c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.38,3.64l2.43,3.67    c0.02,0.03,0.03,0.07,0.03,0.12C83.25,14.38,83.16,14.47,83.04,14.47L83.04,14.47L83.04,14.47z"/>  <path class="st0" d="M10.5,1.24c-5.11,0-9.25,4.15-9.25,9.25s4.15,9.25,9.25,9.25s9.25-4.15,9.25-9.25    C19.75,5.38,15.61,1.24,10.5,1.24z M14.89,12.77c-1.93,1.93-4.78,2.31-6.7,2.31c-0.7,0-1.41-0.05-2.1-0.16c0,0-1.02-5.64,2.14-8.81    c0.83-0.83,1.95-1.28,3.13-1.28c1.27,0,2.49,0.51,3.39,1.42C16.59,8.09,16.64,11,14.89,12.77z"/>  <path class="st1" d="M10.5-0.01C4.7-0.01,0,4.7,0,10.49s4.7,10.5,10.5,10.5S21,16.29,21,10.49C20.99,4.7,16.3-0.01,10.5-0.01z     M10.5,19.74c-5.11,0-9.25-4.15-9.25-9.25s4.14-9.26,9.25-9.26s9.25,4.15,9.25,9.25C19.75,15.61,15.61,19.74,10.5,19.74z"/>  <path class="st1" d="M14.74,6.25C12.9,4.41,9.98,4.35,8.23,6.1c-3.16,3.17-2.14,8.81-2.14,8.81s5.64,1.02,8.81-2.14    C16.64,11,16.59,8.09,14.74,6.25z M12.47,10.34l-0.91,1.87l-0.9-1.87L8.8,9.43l1.86-0.9l0.9-1.87l0.91,1.87l1.86,0.9L12.47,10.34z"    />  <polygon class="st0" points="14.33,9.43 12.47,10.34 11.56,12.21 10.66,10.34 8.8,9.43 10.66,8.53 11.56,6.66 12.47,8.53   "/></g></svg>);
+    background-image: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"   viewBox="0 0 84.49 21" style="enable-background:new 0 0 84.49 21;" xml:space="preserve"><g>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M83.25,14.26c0,0.12-0.09,0.21-0.21,0.21h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39l-1.44,2.39    c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68L76.2,6.84    c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.4-2.35    c0.06-0.11,0.18-0.17,0.3-0.17H83c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.37,3.63l2.43,3.67    C83.24,14.18,83.25,14.22,83.25,14.26z"/>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M66.24,9.59c-0.39-1.88-1.96-3.28-3.84-3.28c-1.03,0-2.03,0.42-2.73,1.18V3.51c0-0.13-0.1-0.23-0.23-0.23h-1.4    c-0.13,0-0.23,0.11-0.23,0.23v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.11,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.73,1.18    c1.88,0,3.45-1.41,3.84-3.29C66.37,10.79,66.37,10.18,66.24,9.59L66.24,9.59z M62.08,13c-1.32,0-2.39-1.11-2.41-2.48v-0.06    c0.02-1.38,1.09-2.48,2.41-2.48s2.42,1.12,2.42,2.51S63.41,13,62.08,13z"/>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M71.67,6.32c-1.98-0.01-3.72,1.35-4.16,3.29c-0.13,0.59-0.13,1.19,0,1.77c0.44,1.94,2.17,3.32,4.17,3.3    c2.35,0,4.26-1.87,4.26-4.19S74.04,6.32,71.67,6.32z M71.65,13.01c-1.33,0-2.42-1.12-2.42-2.51s1.08-2.52,2.42-2.52    c1.33,0,2.42,1.12,2.42,2.51S72.99,13,71.65,13.01L71.65,13.01z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M62.08,7.98c-1.32,0-2.39,1.11-2.41,2.48v0.06C59.68,11.9,60.75,13,62.08,13s2.42-1.12,2.42-2.51    S63.41,7.98,62.08,7.98z M62.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25    c0.63,0,1.17,0.57,1.17,1.27C63.24,11.2,62.73,11.76,62.08,11.76z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M71.65,7.98c-1.33,0-2.42,1.12-2.42,2.51S70.32,13,71.65,13s2.42-1.12,2.42-2.51S72.99,7.98,71.65,7.98z     M71.65,11.76c-0.64,0-1.17-0.57-1.17-1.27c0-0.7,0.53-1.26,1.17-1.26s1.17,0.57,1.17,1.27C72.82,11.21,72.29,11.76,71.65,11.76z"    />  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M45.74,6.53h-1.4c-0.13,0-0.23,0.11-0.23,0.23v0.73c-0.71-0.75-1.7-1.18-2.73-1.18    c-2.17,0-3.94,1.87-3.94,4.19s1.77,4.19,3.94,4.19c1.04,0,2.03-0.43,2.73-1.19v0.73c0,0.13,0.1,0.23,0.23,0.23h1.4    c0.13,0,0.23-0.11,0.23-0.23V6.74c0-0.12-0.09-0.22-0.22-0.22C45.75,6.53,45.75,6.53,45.74,6.53z M44.12,10.53    C44.11,11.9,43.03,13,41.71,13s-2.42-1.12-2.42-2.51s1.08-2.52,2.4-2.52c1.33,0,2.39,1.11,2.41,2.48L44.12,10.53z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M41.71,7.98c-1.33,0-2.42,1.12-2.42,2.51S40.37,13,41.71,13s2.39-1.11,2.41-2.48v-0.06    C44.1,9.09,43.03,7.98,41.71,7.98z M40.55,10.49c0-0.7,0.52-1.27,1.17-1.27c0.64,0,1.14,0.56,1.17,1.25v0.04    c-0.01,0.68-0.53,1.24-1.17,1.24C41.08,11.75,40.55,11.19,40.55,10.49z"/>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M52.41,6.32c-1.03,0-2.03,0.42-2.73,1.18V6.75c0-0.13-0.1-0.23-0.23-0.23h-1.4c-0.13,0-0.23,0.11-0.23,0.23    v10.72c0,0.13,0.1,0.23,0.23,0.23h1.4c0.13,0,0.23-0.1,0.23-0.23V13.5c0.71,0.75,1.7,1.18,2.74,1.18c2.17,0,3.94-1.87,3.94-4.19    S54.58,6.32,52.41,6.32z M52.08,13.01c-1.32,0-2.39-1.11-2.42-2.48v-0.07c0.02-1.38,1.09-2.49,2.4-2.49c1.32,0,2.41,1.12,2.41,2.51    S53.4,13,52.08,13.01L52.08,13.01z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M52.08,7.98c-1.32,0-2.39,1.11-2.42,2.48v0.06c0.03,1.38,1.1,2.48,2.42,2.48s2.41-1.12,2.41-2.51    S53.4,7.98,52.08,7.98z M52.08,11.76c-0.63,0-1.14-0.56-1.17-1.25v-0.04c0.01-0.69,0.54-1.25,1.17-1.25c0.63,0,1.17,0.58,1.17,1.27    S52.72,11.76,52.08,11.76z"/>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M36.08,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68c0-0.98-0.74-1.71-1.62-1.71    c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.11,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68    c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V6.74    c0.01-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03c1.09,0,2.09,0.6,2.6,1.55    c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78L36.08,14.24z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M84.34,13.59l-0.07-0.13l-1.96-2.99l1.94-2.95c0.44-0.67,0.26-1.56-0.41-2.02c-0.02,0-0.03,0-0.04-0.01    c-0.23-0.15-0.5-0.22-0.78-0.22h-1.61c-0.56,0-1.08,0.29-1.37,0.78L79.72,6.6l-0.34-0.56C79.09,5.56,78.57,5.27,78,5.27h-1.6    c-0.6,0-1.13,0.37-1.35,0.92c-2.19-1.66-5.28-1.47-7.26,0.45c-0.35,0.34-0.65,0.72-0.89,1.14c-0.9-1.62-2.58-2.72-4.5-2.72    c-0.5,0-1.01,0.07-1.48,0.23V3.51c0-0.82-0.66-1.48-1.47-1.48h-1.4c-0.81,0-1.47,0.66-1.47,1.47v3.75    c-0.95-1.36-2.5-2.18-4.17-2.19c-0.74,0-1.46,0.16-2.12,0.47c-0.24-0.17-0.54-0.26-0.84-0.26h-1.4c-0.45,0-0.87,0.21-1.15,0.56    c-0.02-0.03-0.04-0.05-0.07-0.08c-0.28-0.3-0.68-0.47-1.09-0.47h-1.39c-0.3,0-0.6,0.09-0.84,0.26c-0.67-0.3-1.39-0.46-2.12-0.46    c-1.83,0-3.43,1-4.37,2.5c-0.2-0.46-0.48-0.89-0.83-1.25c-0.8-0.81-1.89-1.25-3.02-1.25h-0.01c-0.89,0.01-1.75,0.33-2.46,0.88    c-0.74-0.57-1.64-0.88-2.57-0.88H28.1c-0.29,0-0.58,0.03-0.86,0.11c-0.28,0.06-0.56,0.16-0.82,0.28c-0.21-0.12-0.45-0.18-0.7-0.18    h-1.4c-0.82,0-1.47,0.66-1.47,1.47v7.5c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.48-0.66,1.48-1.48l0,0V9.79    c0.03-0.36,0.23-0.59,0.36-0.59c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41c0.82,0,1.47-0.66,1.47-1.47    l-0.01-4.57c0.06-0.32,0.25-0.47,0.35-0.47c0.18,0,0.38,0.18,0.38,0.47v4.57c0,0.82,0.66,1.47,1.47,1.47h1.41    c0.82,0,1.47-0.66,1.47-1.47v-0.38c0.96,1.29,2.46,2.06,4.06,2.06c0.74,0,1.46-0.16,2.12-0.47c0.24,0.17,0.54,0.26,0.84,0.26h1.39    c0.3,0,0.6-0.09,0.84-0.26v2.01c0,0.82,0.66,1.47,1.47,1.47h1.4c0.82,0,1.47-0.66,1.47-1.47v-1.77c0.48,0.15,0.99,0.23,1.49,0.22    c1.7,0,3.22-0.87,4.17-2.2v0.52c0,0.82,0.66,1.47,1.47,1.47h1.4c0.3,0,0.6-0.09,0.84-0.26c0.66,0.31,1.39,0.47,2.12,0.47    c1.92,0,3.6-1.1,4.49-2.73c1.54,2.65,4.95,3.53,7.58,1.98c0.18-0.11,0.36-0.22,0.53-0.36c0.22,0.55,0.76,0.91,1.35,0.9H78    c0.56,0,1.08-0.29,1.37-0.78l0.37-0.61l0.37,0.61c0.29,0.48,0.81,0.78,1.38,0.78h1.6c0.81,0,1.46-0.66,1.45-1.46    C84.49,14.02,84.44,13.8,84.34,13.59L84.34,13.59z M35.86,14.47h-1.41c-0.13,0-0.23-0.11-0.23-0.23V9.68    c0-0.98-0.74-1.71-1.62-1.71c-0.8,0-1.46,0.7-1.59,1.62l0.01,4.66c0,0.13-0.1,0.23-0.23,0.23h-1.41c-0.13,0-0.23-0.11-0.23-0.23    V9.68c0-0.98-0.74-1.71-1.62-1.71c-0.85,0-1.54,0.79-1.6,1.8v4.48c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23    V6.74c0.01-0.13,0.11-0.22,0.23-0.22h1.4c0.13,0,0.22,0.11,0.23,0.22V7.4c0.5-0.68,1.3-1.09,2.16-1.1h0.03    c1.09,0,2.09,0.6,2.6,1.55c0.45-0.95,1.4-1.55,2.44-1.56c1.62,0,2.93,1.25,2.9,2.78l0.01,5.16C36.09,14.36,35.98,14.46,35.86,14.47    L35.86,14.47z M45.97,14.24c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V13.5c-0.7,0.76-1.69,1.18-2.72,1.18    c-2.17,0-3.94-1.87-3.94-4.19s1.77-4.19,3.94-4.19c1.03,0,2.02,0.43,2.73,1.18V6.74c0-0.13,0.1-0.23,0.23-0.23h1.4    c0.12-0.01,0.22,0.08,0.23,0.21c0,0.01,0,0.01,0,0.02v7.51h-0.01V14.24z M52.41,14.67c-1.03,0-2.02-0.43-2.73-1.18v3.97    c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.1-0.23-0.23V6.75c0-0.13,0.1-0.22,0.23-0.22h1.4c0.13,0,0.23,0.11,0.23,0.23v0.73    c0.71-0.76,1.7-1.18,2.73-1.18c2.17,0,3.94,1.86,3.94,4.18S54.58,14.67,52.41,14.67z M66.24,11.39c-0.39,1.87-1.96,3.29-3.84,3.29    c-1.03,0-2.02-0.43-2.73-1.18v0.73c0,0.13-0.1,0.23-0.23,0.23h-1.4c-0.13,0-0.23-0.11-0.23-0.23V3.51c0-0.13,0.1-0.23,0.23-0.23    h1.4c0.13,0,0.23,0.11,0.23,0.23v3.97c0.71-0.75,1.7-1.18,2.73-1.17c1.88,0,3.45,1.4,3.84,3.28C66.37,10.19,66.37,10.8,66.24,11.39    L66.24,11.39L66.24,11.39z M71.67,14.68c-2,0.01-3.73-1.35-4.17-3.3c-0.13-0.59-0.13-1.19,0-1.77c0.44-1.94,2.17-3.31,4.17-3.3    c2.36,0,4.26,1.87,4.26,4.19S74.03,14.68,71.67,14.68L71.67,14.68z M83.04,14.47h-1.61c-0.13,0-0.24-0.06-0.3-0.17l-1.44-2.39    l-1.44,2.39c-0.06,0.11-0.18,0.17-0.3,0.17h-1.61c-0.04,0-0.08-0.01-0.12-0.03c-0.09-0.06-0.13-0.19-0.06-0.28l0,0l2.43-3.68    L76.2,6.84c-0.02-0.03-0.03-0.07-0.03-0.12c0-0.12,0.09-0.21,0.21-0.21h1.61c0.13,0,0.24,0.06,0.3,0.17l1.41,2.36l1.41-2.36    c0.06-0.11,0.18-0.17,0.3-0.17h1.61c0.04,0,0.08,0.01,0.12,0.03c0.09,0.06,0.13,0.19,0.06,0.28l0,0l-2.38,3.64l2.43,3.67    c0.02,0.03,0.03,0.07,0.03,0.12C83.25,14.38,83.16,14.47,83.04,14.47L83.04,14.47L83.04,14.47z"/>  <path class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" d="M10.5,1.24c-5.11,0-9.25,4.15-9.25,9.25s4.15,9.25,9.25,9.25s9.25-4.15,9.25-9.25    C19.75,5.38,15.61,1.24,10.5,1.24z M14.89,12.77c-1.93,1.93-4.78,2.31-6.7,2.31c-0.7,0-1.41-0.05-2.1-0.16c0,0-1.02-5.64,2.14-8.81    c0.83-0.83,1.95-1.28,3.13-1.28c1.27,0,2.49,0.51,3.39,1.42C16.59,8.09,16.64,11,14.89,12.77z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M10.5-0.01C4.7-0.01,0,4.7,0,10.49s4.7,10.5,10.5,10.5S21,16.29,21,10.49C20.99,4.7,16.3-0.01,10.5-0.01z     M10.5,19.74c-5.11,0-9.25-4.15-9.25-9.25s4.14-9.26,9.25-9.26s9.25,4.15,9.25,9.25C19.75,15.61,15.61,19.74,10.5,19.74z"/>  <path class="st1" style="opacity:0.35; enable-background:new;" d="M14.74,6.25C12.9,4.41,9.98,4.35,8.23,6.1c-3.16,3.17-2.14,8.81-2.14,8.81s5.64,1.02,8.81-2.14    C16.64,11,16.59,8.09,14.74,6.25z M12.47,10.34l-0.91,1.87l-0.9-1.87L8.8,9.43l1.86-0.9l0.9-1.87l0.91,1.87l1.86,0.9L12.47,10.34z"    />  <polygon class="st0" style="opacity:0.9; fill: #FFFFFF; enable-background: new;" points="14.33,9.43 12.47,10.34 11.56,12.21 10.66,10.34 8.8,9.43 10.66,8.53 11.56,6.66 12.47,8.53   "/></g></svg>);
 }
 
 .mapboxgl-ctrl.mapboxgl-ctrl-attrib {
@@ -161,11 +161,12 @@ a.mapboxgl-ctrl-logo {
     color: inherit;
     text-decoration: underline;
 }
-.mapboxgl-ctrl-attrib .mapboxgl-improve-map {
+/* stylelint-disable */
+.mapboxgl-ctrl-attrib .mapbox-improve-map {
     font-weight: bold;
     margin-left: 2px;
 }
-
+/*stylelint-enable*/
 .mapboxgl-ctrl-scale {
     background-color: rgba(255,255,255,0.75);
     font-size: 10px;
@@ -318,8 +319,11 @@ a.mapboxgl-ctrl-logo {
     border: 2px dotted #202020;
     opacity: 0.5;
 }
+
 @media print {
-    .mapboxgl-improve-map {
+/* stylelint-disable */
+    .mapbox-improve-map {
         display:none;
     }
+/* stylelint-enable */
 }
diff --git a/docs/_posts/examples/3400-01-31-animate-a-line.html b/docs/_posts/examples/3400-01-31-animate-a-line.html
new file mode 100644
index 00000000000..0e908dfb4f5
--- /dev/null
+++ b/docs/_posts/examples/3400-01-31-animate-a-line.html
@@ -0,0 +1,125 @@
+--- 
+layout: example 
+category: example 
+title: Animate a line 
+description: Animate a line by updating a GeoJSON source on each frame. 
+tags: 
+- layers 
+- sources 
+---
+<style>
+button {
+    position: absolute;
+    margin: 20px;
+}
+
+#pause::after {
+    content: 'Pause';
+}
+
+#pause.pause::after {
+    content: 'Play';
+}
+</style>
+<div id='map'></div>
+<button id='pause'></button>
+<script>
+var map = new mapboxgl.Map({
+    container: 'map',
+    style: 'mapbox://styles/mapbox/streets-v8',
+    center: [-180, 0],
+    zoom: 0.5,
+    renderWorldCopies: false
+});
+
+// Create a GeoJSON source with an empty lineString.
+var geojson = {
+    "type": "FeatureCollection",
+    "features": [{
+        "type": "Feature",
+        "geometry": {
+            "type": "LineString",
+            "coordinates": [
+                [0, 0]
+            ]
+        }
+    }]
+};
+
+var speedFactor = 30; // number of frames per longitude degree
+var animation; // to store the animation
+var startTime = performance.now(); // system timestamp
+var progress = 0; // progress = timestamp - startTime
+var pause = false;
+var pauseButton = document.getElementById('pause');
+
+map.on('load', function() {
+
+    // Add a source and layer displaying the line which will be
+    // animated in a circle as a sine wave along the map.
+    map.addSource('line-animation', {
+        'type': 'geojson',
+        'data': geojson
+    });
+
+    map.addLayer({
+        'id': 'line-animation',
+        'type': 'line',
+        'source': 'line-animation',
+        'layout': {
+            'line-cap': 'round',
+            'line-join': 'round'
+        },
+        'paint': {
+            'line-color': '#ed6498',
+            'line-width': 5,
+            'line-opacity': .8
+        }
+    });
+
+    animateLine();
+
+    pauseButton.addEventListener('click', function() {
+        pauseButton.classList.toggle('pause');
+        if (pauseButton.classList.contains('pause')) {
+            cancelAnimationFrame(animation);
+        } else {
+            pause = true;
+            animateLine();
+        }
+    });
+
+    // requestAnimationFrame pauses when the tab is inactive
+    // reset startTime and progress when switched back
+    document.addEventListener('visibilitychange', function() {
+        pause = true;
+    });
+
+    function animateLine(timestamp) {
+        if (pause) {
+            // no timestamp in frame0
+            startTime = performance.now() - progress;
+            pause = false;
+        } else {
+            progress = timestamp - startTime;
+        }
+
+        // restart if all 360 degrees are covered
+        if (progress > speedFactor * 360) {
+            startTime = timestamp;
+            geojson.features[0].geometry.coordinates = [];
+        } else {
+            var x = progress / speedFactor;
+            // draw a sine wave with some math.
+            var y = Math.sin(x * Math.PI / 90) * 40;
+            // append new coordinates to the lineString
+            // then update the map
+            geojson.features[0].geometry.coordinates.push([x, y]);
+            map.getSource('line-animation').setData(geojson);
+        }
+        // Request the next frame of the animation.
+        animation = requestAnimationFrame(animateLine);
+    }
+
+});
+</script>
diff --git a/package.json b/package.json
index f5cdc4d0b67..bb8424c562d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "url": "git://github.com/mapbox/mapbox-gl-js.git"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=6.4.0"
   },
   "dependencies": {
     "@mapbox/gl-matrix": "^0.0.1",
diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js
index f6ccdf8dd1b..9a15cba5f73 100644
--- a/src/data/bucket/symbol_bucket.js
+++ b/src/data/bucket/symbol_bucket.js
@@ -32,6 +32,7 @@ const elementArrayType = createElementArrayType();
 
 const layoutAttributes = [
     {name: 'a_pos_offset',  components: 4, type: 'Int16'},
+    {name: 'a_label_pos',   components: 2, type: 'Int16'},
     {name: 'a_data',        components: 4, type: 'Uint16'}
 ];
 
@@ -60,15 +61,16 @@ const symbolInterfaces = {
     },
     collisionBox: { // used to render collision boxes for debugging purposes
         layoutAttributes: [
-            {name: 'a_pos',     components: 2, type: 'Int16'},
-            {name: 'a_extrude', components: 2, type: 'Int16'},
-            {name: 'a_data',    components: 2, type: 'Uint8'}
+            {name: 'a_pos',        components: 2, type: 'Int16'},
+            {name: 'a_anchor_pos', components: 2, type: 'Int16'},
+            {name: 'a_extrude',    components: 2, type: 'Int16'},
+            {name: 'a_data',       components: 2, type: 'Uint8'}
         ],
         elementArrayType: createElementArrayType(2)
     }
 };
 
-function addVertex(array, x, y, ox, oy, tx, ty, sizeVertex, minzoom, maxzoom, labelminzoom, labelangle) {
+function addVertex(array, x, y, ox, oy, labelX, labelY, tx, ty, sizeVertex, minzoom, maxzoom, labelminzoom, labelangle) {
     array.emplaceBack(
         // a_pos_offset
         x,
@@ -76,9 +78,13 @@ function addVertex(array, x, y, ox, oy, tx, ty, sizeVertex, minzoom, maxzoom, la
         Math.round(ox * 64),
         Math.round(oy * 64),
 
+        // a_label_pos
+        labelX,
+        labelY,
+
         // a_data
-        tx / 4, // x coordinate of symbol on glyph atlas texture
-        ty / 4, // y coordinate of symbol on glyph atlas texture
+        tx, // x coordinate of symbol on glyph atlas texture
+        ty, // y coordinate of symbol on glyph atlas texture
         packUint8ToFloat(
             (labelminzoom || 0) * 10, // labelminzoom
             labelangle % 256 // labelangle
@@ -95,11 +101,14 @@ function addVertex(array, x, y, ox, oy, tx, ty, sizeVertex, minzoom, maxzoom, la
     );
 }
 
-function addCollisionBoxVertex(layoutVertexArray, point, extrude, maxZoom, placementZoom) {
+function addCollisionBoxVertex(layoutVertexArray, point, anchor, extrude, maxZoom, placementZoom) {
     return layoutVertexArray.emplaceBack(
         // pos
         point.x,
         point.y,
+        // a_anchor_pos
+        anchor.x,
+        anchor.y,
         // extrude
         Math.round(extrude.x),
         Math.round(extrude.y),
@@ -360,10 +369,11 @@ class SymbolBucket {
             if (feature.text) {
                 const allowsVerticalWritingMode = scriptDetection.allowsVerticalWritingMode(feature.text);
                 const textOffset = this.layers[0].getLayoutValue('text-offset', {zoom: this.zoom}, feature.properties).map((t)=> t * oneEm);
+                const spacingIfAllowed = scriptDetection.allowsLetterSpacing(feature.text) ? spacing : 0;
 
                 shapedTextOrientations = {
-                    [WritingMode.horizontal]: shapeText(feature.text, stacks[fontstack], maxWidth, lineHeight, horizontalAlign, verticalAlign, justify, spacing, textOffset, oneEm, WritingMode.horizontal),
-                    [WritingMode.vertical]: allowsVerticalWritingMode && textAlongLine && shapeText(feature.text, stacks[fontstack], maxWidth, lineHeight, horizontalAlign, verticalAlign, justify, spacing, textOffset, oneEm, WritingMode.vertical)
+                    [WritingMode.horizontal]: shapeText(feature.text, stacks[fontstack], maxWidth, lineHeight, horizontalAlign, verticalAlign, justify, spacingIfAllowed, textOffset, oneEm, WritingMode.horizontal),
+                    [WritingMode.vertical]: allowsVerticalWritingMode && textAlongLine && shapeText(feature.text, stacks[fontstack], maxWidth, lineHeight, horizontalAlign, verticalAlign, justify, spacingIfAllowed, textOffset, oneEm, WritingMode.vertical)
                 };
             } else {
                 shapedTextOrientations = {};
@@ -372,16 +382,15 @@ class SymbolBucket {
             let shapedIcon;
             if (feature.icon) {
                 const image = icons[feature.icon];
-                const iconOffset = this.layers[0].getLayoutValue('icon-offset', {zoom: this.zoom}, feature.properties);
-                shapedIcon = shapeIcon(image, iconOffset);
-
                 if (image) {
+                    shapedIcon = shapeIcon(image,
+                        this.layers[0].getLayoutValue('icon-offset', {zoom: this.zoom}, feature.properties));
                     if (this.sdfIcons === undefined) {
                         this.sdfIcons = image.sdf;
                     } else if (this.sdfIcons !== image.sdf) {
                         util.warnOnce('Style sheet warning: Cannot mix SDF and non-SDF icons in one buffer');
                     }
-                    if (image.pixelRatio !== 1) {
+                    if (!image.isNativePixelRatio) {
                         this.iconsNeedLinear = true;
                     } else if (layout['icon-rotate'] !== 0 || !this.layers[0].isLayoutValueFeatureConstant('icon-rotate')) {
                         this.iconsNeedLinear = true;
@@ -523,6 +532,10 @@ class SymbolBucket {
         const layer = this.layers[0];
         const layout = layer.layout;
 
+        // Symbols that don't show until greater than the CollisionTile's maxScale won't even be added
+        // to the buffers. Even though pan operations on a tilted map might cause the symbol to be
+        // displayable, we have to stay conservative here because the CollisionTile didn't consider
+        // this scale range.
         const maxScale = collisionTile.maxScale;
 
         const textAlongLine = layout['text-rotation-alignment'] === 'map' && layout['symbol-placement'] === 'line';
@@ -608,7 +621,8 @@ class SymbolBucket {
                         textAlongLine,
                         collisionTile.angle,
                         symbolInstance.featureProperties,
-                        symbolInstance.writingModes);
+                        symbolInstance.writingModes,
+                        symbolInstance.anchor);
                 }
             }
 
@@ -629,7 +643,9 @@ class SymbolBucket {
                         layout['icon-keep-upright'],
                         iconAlongLine,
                         collisionTile.angle,
-                        symbolInstance.featureProperties
+                        symbolInstance.featureProperties,
+                        null,
+                        symbolInstance.anchor
                     );
                 }
             }
@@ -639,7 +655,7 @@ class SymbolBucket {
         if (showCollisionBoxes) this.addToDebugBuffers(collisionTile);
     }
 
-    addSymbols(arrays, quads, scale, sizeVertex, keepUpright, alongLine, placementAngle, featureProperties, writingModes) {
+    addSymbols(arrays, quads, scale, sizeVertex, keepUpright, alongLine, placementAngle, featureProperties, writingModes, labelAnchor) {
         const elementArray = arrays.elementArray;
         const layoutVertexArray = arrays.layoutVertexArray;
 
@@ -676,10 +692,10 @@ class SymbolBucket {
             const segment = arrays.prepareSegment(4);
             const index = segment.vertexLength;
 
-            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, tl.x, tl.y, tex.x, tex.y, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
-            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, tr.x, tr.y, tex.x + tex.w, tex.y, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
-            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, bl.x, bl.y, tex.x, tex.y + tex.h, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
-            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, br.x, br.y, tex.x + tex.w, tex.y + tex.h, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
+            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, tl.x, tl.y, labelAnchor.x, labelAnchor.y, tex.x, tex.y, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
+            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, tr.x, tr.y, labelAnchor.x, labelAnchor.y, tex.x + tex.w, tex.y, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
+            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, bl.x, bl.y, labelAnchor.x, labelAnchor.y, tex.x, tex.y + tex.h, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
+            addVertex(layoutVertexArray, anchorPoint.x, anchorPoint.y, br.x, br.y, labelAnchor.x, labelAnchor.y, tex.x + tex.w, tex.y + tex.h, sizeVertex, minZoom, maxZoom, placementZoom, glyphAngle);
 
             elementArray.emplaceBack(index, index + 1, index + 2);
             elementArray.emplaceBack(index + 1, index + 2, index + 3);
@@ -709,7 +725,12 @@ class SymbolBucket {
 
                 for (let b = feature.boxStartIndex; b < feature.boxEndIndex; b++) {
                     const box = this.collisionBoxArray.get(b);
-                    const anchorPoint = box.anchorPoint;
+                    if (collisionTile.perspectiveRatio === 1 && box.maxScale < 1) {
+                        // These boxes aren't used on unpitched maps
+                        // See CollisionTile#insertCollisionFeature
+                        continue;
+                    }
+                    const boxAnchorPoint = box.anchorPoint;
 
                     const tl = new Point(box.x1, box.y1 * yStretch)._rotate(angle);
                     const tr = new Point(box.x2, box.y1 * yStretch)._rotate(angle);
@@ -722,10 +743,10 @@ class SymbolBucket {
                     const segment = arrays.prepareSegment(4);
                     const index = segment.vertexLength;
 
-                    addCollisionBoxVertex(layoutVertexArray, anchorPoint, tl, maxZoom, placementZoom);
-                    addCollisionBoxVertex(layoutVertexArray, anchorPoint, tr, maxZoom, placementZoom);
-                    addCollisionBoxVertex(layoutVertexArray, anchorPoint, br, maxZoom, placementZoom);
-                    addCollisionBoxVertex(layoutVertexArray, anchorPoint, bl, maxZoom, placementZoom);
+                    addCollisionBoxVertex(layoutVertexArray, boxAnchorPoint, symbolInstance.anchor, tl, maxZoom, placementZoom);
+                    addCollisionBoxVertex(layoutVertexArray, boxAnchorPoint, symbolInstance.anchor, tr, maxZoom, placementZoom);
+                    addCollisionBoxVertex(layoutVertexArray, boxAnchorPoint, symbolInstance.anchor, br, maxZoom, placementZoom);
+                    addCollisionBoxVertex(layoutVertexArray, boxAnchorPoint, symbolInstance.anchor, bl, maxZoom, placementZoom);
 
                     elementArray.emplaceBack(index, index + 1);
                     elementArray.emplaceBack(index + 1, index + 2);
diff --git a/src/data/feature_index.js b/src/data/feature_index.js
index 9a1589e671a..f89ad9b4e22 100644
--- a/src/data/feature_index.js
+++ b/src/data/feature_index.js
@@ -242,7 +242,7 @@ class FeatureIndex {
                 if (layerResult === undefined) {
                     layerResult = result[layerID] = [];
                 }
-                layerResult.push(geojsonFeature);
+                layerResult.push({ featureIndex: index, feature: geojsonFeature });
             }
         }
     }
diff --git a/src/geo/transform.js b/src/geo/transform.js
index c51fd979c3b..193224d96fa 100644
--- a/src/geo/transform.js
+++ b/src/geo/transform.js
@@ -394,6 +394,21 @@ class Transform {
         return new Float32Array(posMatrix);
     }
 
+    /**
+     * Calculate the distance from the center of a tile to the camera
+     * These distances are in view-space dimensions derived from the size of the
+     * viewport, similar to this.cameraToCenterDistance
+     * If the tile is dead-center in the viewport, then cameraToTileDistance == cameraToCenterDistance
+     *
+     * @param {Tile} tile
+     */
+    cameraToTileDistance(tile: Object) {
+        const posMatrix = this.calculatePosMatrix(tile.coord, tile.sourceMaxZoom);
+        const tileCenter = [tile.tileSize / 2, tile.tileSize / 2, 0, 1];
+        vec4.transformMat4(tileCenter, tileCenter, posMatrix);
+        return tileCenter[3];
+    }
+
     _constrain() {
         if (!this.center || !this.width || !this.height || this._constraining) return;
 
diff --git a/src/render/draw_background.js b/src/render/draw_background.js
index ad75fbfa241..d90a1a9f39a 100644
--- a/src/render/draw_background.js
+++ b/src/render/draw_background.js
@@ -21,6 +21,7 @@ function drawBackground(painter, sourceCache, layer) {
 
     let program;
     if (image) {
+        if (pattern.isPatternMissing(image, painter)) return;
         program = painter.useProgram('fillPattern', painter.basicFillProgramConfiguration);
         pattern.prepare(image, painter, program);
         painter.tileExtentPatternVAO.bind(gl, program, painter.tileExtentBuffer);
diff --git a/src/render/draw_collision_debug.js b/src/render/draw_collision_debug.js
index e7b1388eadc..6f29e0e060b 100644
--- a/src/render/draw_collision_debug.js
+++ b/src/render/draw_collision_debug.js
@@ -7,6 +7,10 @@ function drawCollisionDebug(painter, sourceCache, layer, coords) {
     gl.enable(gl.STENCIL_TEST);
     const program = painter.useProgram('collisionBox');
 
+    gl.activeTexture(gl.TEXTURE1);
+    painter.frameHistory.bind(gl);
+    gl.uniform1i(program.u_fadetexture, 1);
+
     for (let i = 0; i < coords.length; i++) {
         const coord = coords[i];
         const tile = sourceCache.getTile(coord);
@@ -22,7 +26,12 @@ function drawCollisionDebug(painter, sourceCache, layer, coords) {
         painter.lineWidth(1);
         gl.uniform1f(program.u_scale, Math.pow(2, painter.transform.zoom - tile.coord.z));
         gl.uniform1f(program.u_zoom, painter.transform.zoom * 10);
-        gl.uniform1f(program.u_maxzoom, (tile.coord.z + 1) * 10);
+        const maxZoom = Math.max(0, Math.min(25, tile.coord.z + Math.log(tile.collisionTile.maxScale) / Math.LN2));
+        gl.uniform1f(program.u_maxzoom, maxZoom * 10);
+
+        gl.uniform1f(program.u_collision_y_stretch, tile.collisionTile.yStretch);
+        gl.uniform1f(program.u_pitch, painter.transform.pitch / 360 * 2 * Math.PI);
+        gl.uniform1f(program.u_camera_to_center_distance, painter.transform.cameraToCenterDistance);
 
         for (const segment of buffers.segments) {
             segment.vaos[layer.id].bind(gl, program, buffers.layoutVertexBuffer, buffers.elementBuffer, null, segment.vertexOffset);
diff --git a/src/render/draw_fill.js b/src/render/draw_fill.js
index a08454d12b7..b01b2f2039a 100644
--- a/src/render/draw_fill.js
+++ b/src/render/draw_fill.js
@@ -42,6 +42,8 @@ function drawFill(painter, sourceCache, layer, coords) {
 }
 
 function drawFillTiles(painter, sourceCache, layer, coords, drawFn) {
+    if (pattern.isPatternMissing(layer.paint['fill-pattern'], painter)) return;
+
     let firstTile = true;
     for (const coord of coords) {
         const tile = sourceCache.getTile(coord);
diff --git a/src/render/draw_fill_extrusion.js b/src/render/draw_fill_extrusion.js
index a5a4c7c9161..e429d730fc0 100644
--- a/src/render/draw_fill_extrusion.js
+++ b/src/render/draw_fill_extrusion.js
@@ -151,6 +151,7 @@ function drawExtrusion(painter, source, layer, coord) {
     programConfiguration.setUniforms(gl, program, layer, {zoom: painter.transform.zoom});
 
     if (image) {
+        if (pattern.isPatternMissing(image, painter)) return;
         pattern.prepare(image, painter, program);
         pattern.setTile(tile, painter, program);
         gl.uniform1f(program.u_height_factor, -Math.pow(2, coord.z) / tile.tileSize / 8);
diff --git a/src/render/draw_line.js b/src/render/draw_line.js
index c8599e7c3cc..5274ab04b0a 100644
--- a/src/render/draw_line.js
+++ b/src/render/draw_line.js
@@ -73,12 +73,13 @@ function drawLineTile(program, painter, tile, buffers, layer, coord, layerData,
             gl.uniform1f(program.u_sdfgamma, painter.lineAtlas.width / (Math.min(widthA, widthB) * 256 * browser.devicePixelRatio) / 2);
 
         } else if (image) {
-            imagePosA = painter.spriteAtlas.getPosition(image.from, true);
-            imagePosB = painter.spriteAtlas.getPosition(image.to, true);
+            imagePosA = painter.spriteAtlas.getPattern(image.from);
+            imagePosB = painter.spriteAtlas.getPattern(image.to);
             if (!imagePosA || !imagePosB) return;
 
-            gl.uniform2f(program.u_pattern_size_a, imagePosA.size[0] * image.fromScale / tileRatio, imagePosB.size[1]);
-            gl.uniform2f(program.u_pattern_size_b, imagePosB.size[0] * image.toScale / tileRatio, imagePosB.size[1]);
+            gl.uniform2f(program.u_pattern_size_a, imagePosA.displaySize[0] * image.fromScale / tileRatio, imagePosB.displaySize[1]);
+            gl.uniform2f(program.u_pattern_size_b, imagePosB.displaySize[0] * image.toScale / tileRatio, imagePosB.displaySize[1]);
+            gl.uniform2fv(program.u_texsize, painter.spriteAtlas.getPixelSize());
         }
 
         gl.uniform2f(program.u_gl_units_to_pixels, 1 / painter.transform.pixelsToGLUnits[0], 1 / painter.transform.pixelsToGLUnits[1]);
diff --git a/src/render/draw_symbol.js b/src/render/draw_symbol.js
index 0b56185c127..7fd8f95abde 100644
--- a/src/render/draw_symbol.js
+++ b/src/render/draw_symbol.js
@@ -2,7 +2,6 @@
 
 const assert = require('assert');
 const util = require('../util/util');
-const browser = require('../util/browser');
 const drawCollisionDebug = require('./draw_collision_debug');
 const pixelsToTileUnits = require('../source/pixels_to_tile_units');
 const interpolationFactor = require('../style-spec/function').interpolationFactor;
@@ -101,6 +100,8 @@ function drawLayerSymbols(painter, sourceCache, layer, coords, isText, translate
         gl.uniformMatrix4fv(program.u_matrix, false,
                 painter.translatePosMatrix(coord.posMatrix, tile, translate, translateAnchor));
 
+        gl.uniform1f(program.u_collision_y_stretch, tile.collisionTile.yStretch);
+
         drawTileSymbols(program, programConfiguration, painter, layer, tile, buffers, isText, isSDF,
                 pitchWithMap);
 
@@ -130,16 +131,16 @@ function setSymbolDrawState(program, painter, layer, tileZoom, isText, isSDF, ro
         if (!glyphAtlas) return;
 
         glyphAtlas.updateTexture(gl);
-        gl.uniform2f(program.u_texsize, glyphAtlas.width / 4, glyphAtlas.height / 4);
+        gl.uniform2f(program.u_texsize, glyphAtlas.width, glyphAtlas.height);
     } else {
         const mapMoving = painter.options.rotating || painter.options.zooming;
         const iconSizeScaled = !layer.isLayoutValueFeatureConstant('icon-size') ||
             !layer.isLayoutValueZoomConstant('icon-size') ||
             layer.getLayoutValue('icon-size', { zoom: tr.zoom }) !== 1;
-        const iconScaled = iconSizeScaled || browser.devicePixelRatio !== painter.spriteAtlas.pixelRatio || iconsNeedLinear;
+        const iconScaled = iconSizeScaled || iconsNeedLinear;
         const iconTransformed = pitchWithMap || tr.pitch;
         painter.spriteAtlas.bind(gl, isSDF || mapMoving || iconScaled || iconTransformed);
-        gl.uniform2f(program.u_texsize, painter.spriteAtlas.width / 4, painter.spriteAtlas.height / 4);
+        gl.uniform2fv(program.u_texsize, painter.spriteAtlas.getPixelSize());
     }
 
     gl.activeTexture(gl.TEXTURE1);
@@ -192,6 +193,22 @@ function setSymbolDrawState(program, painter, layer, tileZoom, isText, isSDF, ro
     } else if (sizeData.isFeatureConstant && sizeData.isZoomConstant) {
         gl.uniform1f(program.u_size, sizeData.layoutSize);
     }
+    gl.uniform1f(program.u_camera_to_center_distance, tr.cameraToCenterDistance);
+    if (layer.layout['symbol-placement'] === 'line' &&
+        layer.layout['text-rotation-alignment'] === 'map' &&
+        layer.layout['text-pitch-alignment'] === 'viewport' &&
+        layer.layout['text-field']) {
+        // We hide line labels with viewport alignment as they move into the distance
+        // because the approximations we use for drawing their glyphs get progressively worse
+        // The "1.5" here means we start hiding them when the distance from the label
+        // to the camera is 50% greater than the distance from the center of the map
+        // to the camera. Depending on viewport properties, you might expect this to filter
+        // the top third of the screen at pitch 60, and do almost nothing at pitch 45
+        gl.uniform1f(program.u_max_camera_distance, 1.5);
+    } else {
+        // "10" is effectively infinite at any pitch we support
+        gl.uniform1f(program.u_max_camera_distance, 10);
+    }
 }
 
 function drawTileSymbols(program, programConfiguration, painter, layer, tile, buffers, isText, isSDF, pitchWithMap) {
diff --git a/src/render/painter.js b/src/render/painter.js
index 04c7ade994b..26d12870aaf 100644
--- a/src/render/painter.js
+++ b/src/render/painter.js
@@ -393,6 +393,14 @@ class Painter {
         assert(gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS), gl.getShaderInfoLog(vertexShader));
         gl.attachShader(program, vertexShader);
 
+
+        // For the symbol program, manually ensure the attrib bound to position 0 is always used (either a_data or a_pos_offset would work here).
+        // This is needed to fix https://github.com/mapbox/mapbox-gl-js/issues/4607 — otherwise a_size can be bound first, causing rendering to fail.
+        // All remaining attribs will be bound dynamically below.
+        if (name === 'symbolSDF') {
+            gl.bindAttribLocation(program, 0, 'a_data');
+        }
+
         gl.linkProgram(program);
         assert(gl.getProgramParameter(program, gl.LINK_STATUS), gl.getProgramInfoLog(program));
 
diff --git a/src/render/pattern.js b/src/render/pattern.js
index cfe3539caaf..851d4834415 100644
--- a/src/render/pattern.js
+++ b/src/render/pattern.js
@@ -1,22 +1,37 @@
 'use strict';
 
+const assert = require('assert');
+
 const pixelsToTileUnits = require('../source/pixels_to_tile_units');
 
+/**
+ * Checks whether a pattern image is needed, and if it is, whether it is not loaded.
+ *
+ * @returns {boolean} true if a needed image is missing and rendering needs to be skipped.
+ */
+exports.isPatternMissing = function(image, painter) {
+    if (!image) return false;
+    const imagePosA = painter.spriteAtlas.getPattern(image.from);
+    const imagePosB = painter.spriteAtlas.getPattern(image.to);
+    return !imagePosA || !imagePosB;
+};
+
 exports.prepare = function (image, painter, program) {
     const gl = painter.gl;
 
-    const imagePosA = painter.spriteAtlas.getPosition(image.from, true);
-    const imagePosB = painter.spriteAtlas.getPosition(image.to, true);
-    if (!imagePosA || !imagePosB) return;
+    const imagePosA = painter.spriteAtlas.getPattern(image.from);
+    const imagePosB = painter.spriteAtlas.getPattern(image.to);
+    assert(imagePosA && imagePosB);
 
     gl.uniform1i(program.u_image, 0);
     gl.uniform2fv(program.u_pattern_tl_a, imagePosA.tl);
     gl.uniform2fv(program.u_pattern_br_a, imagePosA.br);
     gl.uniform2fv(program.u_pattern_tl_b, imagePosB.tl);
     gl.uniform2fv(program.u_pattern_br_b, imagePosB.br);
+    gl.uniform2fv(program.u_texsize, painter.spriteAtlas.getPixelSize());
     gl.uniform1f(program.u_mix, image.t);
-    gl.uniform2fv(program.u_pattern_size_a, imagePosA.size);
-    gl.uniform2fv(program.u_pattern_size_b, imagePosB.size);
+    gl.uniform2fv(program.u_pattern_size_a, imagePosA.displaySize);
+    gl.uniform2fv(program.u_pattern_size_b, imagePosB.displaySize);
     gl.uniform1f(program.u_scale_a, image.fromScale);
     gl.uniform1f(program.u_scale_b, image.toScale);
 
diff --git a/src/render/shaders.js b/src/render/shaders.js
index b4305c853b6..b3e735f608c 100644
--- a/src/render/shaders.js
+++ b/src/render/shaders.js
@@ -1,76 +1,77 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
 
 // readFileSync calls must be written out long-form for brfs.
+/* eslint-disable prefer-template, no-path-concat */
+
 module.exports = {
     prelude: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/_prelude.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/_prelude.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/_prelude.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/_prelude.vertex.glsl', 'utf8')
     },
     circle: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/circle.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/circle.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/circle.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/circle.vertex.glsl', 'utf8')
     },
     collisionBox: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/collision_box.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/collision_box.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/collision_box.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/collision_box.vertex.glsl', 'utf8')
     },
     debug: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/debug.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/debug.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/debug.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/debug.vertex.glsl', 'utf8')
     },
     fill: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill.vertex.glsl', 'utf8')
     },
     fillOutline: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill_outline.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill_outline.vertex.glsl', 'utf8')
     },
     fillOutlinePattern: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline_pattern.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_outline_pattern.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill_outline_pattern.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill_outline_pattern.vertex.glsl', 'utf8')
     },
     fillPattern: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_pattern.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_pattern.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill_pattern.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill_pattern.vertex.glsl', 'utf8')
     },
     fillExtrusion: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill_extrusion.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill_extrusion.vertex.glsl', 'utf8')
     },
     fillExtrusionPattern: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion_pattern.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/fill_extrusion_pattern.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/fill_extrusion_pattern.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/fill_extrusion_pattern.vertex.glsl', 'utf8')
     },
     extrusionTexture: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/extrusion_texture.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/extrusion_texture.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/extrusion_texture.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/extrusion_texture.vertex.glsl', 'utf8')
     },
     line: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/line.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/line.vertex.glsl', 'utf8')
     },
     linePattern: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line_pattern.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line_pattern.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/line_pattern.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/line_pattern.vertex.glsl', 'utf8')
     },
     lineSDF: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/line_sdf.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/line_sdf.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/line_sdf.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/line_sdf.vertex.glsl', 'utf8')
     },
     raster: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/raster.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/raster.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/raster.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/raster.vertex.glsl', 'utf8')
     },
     symbolIcon: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_icon.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_icon.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/symbol_icon.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/symbol_icon.vertex.glsl', 'utf8')
     },
     symbolSDF: {
-        fragmentSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_sdf.fragment.glsl'), 'utf8'),
-        vertexSource: fs.readFileSync(path.join(__dirname, '../shaders/symbol_sdf.vertex.glsl'), 'utf8')
+        fragmentSource: fs.readFileSync(__dirname + '/../shaders/symbol_sdf.fragment.glsl', 'utf8'),
+        vertexSource: fs.readFileSync(__dirname + '/../shaders/symbol_sdf.vertex.glsl', 'utf8')
     }
 };
diff --git a/src/shaders/collision_box.fragment.glsl b/src/shaders/collision_box.fragment.glsl
index 030f1219f8e..aa0e5df0d5f 100644
--- a/src/shaders/collision_box.fragment.glsl
+++ b/src/shaders/collision_box.fragment.glsl
@@ -1,23 +1,37 @@
 uniform float u_zoom;
+// u_maxzoom is derived from the maximum scale considered by the CollisionTile
+// Labels with placement zoom greater than this value will not be placed,
+// regardless of perspective effects.
 uniform float u_maxzoom;
+uniform sampler2D u_fadetexture;
 
+// v_max_zoom is a collision-box-specific value that controls when line-following
+// collision boxes are used.
 varying float v_max_zoom;
 varying float v_placement_zoom;
+varying float v_perspective_zoom_adjust;
+varying vec2 v_fade_tex;
 
 void main() {
 
     float alpha = 0.5;
 
+    // Green = no collisions, label is showing
     gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0) * alpha;
 
-    if (v_placement_zoom > u_zoom) {
+    // Red = collision, label hidden
+    if (texture2D(u_fadetexture, v_fade_tex).a < 1.0) {
         gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0) * alpha;
     }
 
-    if (u_zoom >= v_max_zoom) {
+    // Faded black = this collision box is not used at this zoom (for curved labels)
+    if (u_zoom >= v_max_zoom + v_perspective_zoom_adjust) {
         gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0) * alpha * 0.25;
     }
 
+    // Faded blue = the placement scale for this label is beyond the CollisionTile
+    // max scale, so it's impossible for this label to show without collision detection
+    // being run again (the label's glyphs haven't even been added to the symbol bucket)
     if (v_placement_zoom >= u_maxzoom) {
         gl_FragColor = vec4(0.0, 0.0, 1.0, 1.0) * alpha * 0.2;
     }
diff --git a/src/shaders/collision_box.vertex.glsl b/src/shaders/collision_box.vertex.glsl
index d141b13873a..3ae55780341 100644
--- a/src/shaders/collision_box.vertex.glsl
+++ b/src/shaders/collision_box.vertex.glsl
@@ -1,16 +1,32 @@
 attribute vec2 a_pos;
+attribute vec2 a_anchor_pos;
 attribute vec2 a_extrude;
 attribute vec2 a_data;
 
 uniform mat4 u_matrix;
 uniform float u_scale;
+uniform float u_pitch;
+uniform float u_collision_y_stretch;
+uniform float u_camera_to_center_distance;
 
 varying float v_max_zoom;
 varying float v_placement_zoom;
+varying float v_perspective_zoom_adjust;
+varying vec2 v_fade_tex;
 
 void main() {
-    gl_Position = u_matrix * vec4(a_pos + a_extrude / u_scale, 0.0, 1.0);
+    vec4 projectedPoint = u_matrix * vec4(a_anchor_pos, 0, 1);
+    highp float camera_to_anchor_distance = projectedPoint.w;
+    highp float collision_perspective_ratio = 1.0 + 0.5 * ((camera_to_anchor_distance / u_camera_to_center_distance) - 1.0);
+
+    highp float incidence_stretch  = camera_to_anchor_distance / (u_camera_to_center_distance * cos(u_pitch));
+    highp float collision_adjustment = max(1.0, incidence_stretch / u_collision_y_stretch);
+
+    gl_Position = u_matrix * vec4(a_pos + a_extrude * collision_perspective_ratio * collision_adjustment / u_scale, 0.0, 1.0);
 
     v_max_zoom = a_data.x;
     v_placement_zoom = a_data.y;
+
+    v_perspective_zoom_adjust = floor(log2(collision_perspective_ratio * collision_adjustment) * 10.0);
+    v_fade_tex = vec2((v_placement_zoom + v_perspective_zoom_adjust) / 255.0, 0.0);
 }
diff --git a/src/shaders/fill_extrusion_pattern.fragment.glsl b/src/shaders/fill_extrusion_pattern.fragment.glsl
index d216f3b8a59..9aa068a6c91 100644
--- a/src/shaders/fill_extrusion_pattern.fragment.glsl
+++ b/src/shaders/fill_extrusion_pattern.fragment.glsl
@@ -2,6 +2,7 @@ uniform vec2 u_pattern_tl_a;
 uniform vec2 u_pattern_br_a;
 uniform vec2 u_pattern_tl_b;
 uniform vec2 u_pattern_br_b;
+uniform vec2 u_texsize;
 uniform float u_mix;
 
 uniform sampler2D u_image;
@@ -18,11 +19,11 @@ void main() {
     #pragma mapbox: initialize lowp float height
 
     vec2 imagecoord = mod(v_pos_a, 1.0);
-    vec2 pos = mix(u_pattern_tl_a, u_pattern_br_a, imagecoord);
+    vec2 pos = mix(u_pattern_tl_a / u_texsize, u_pattern_br_a / u_texsize, imagecoord);
     vec4 color1 = texture2D(u_image, pos);
 
     vec2 imagecoord_b = mod(v_pos_b, 1.0);
-    vec2 pos2 = mix(u_pattern_tl_b, u_pattern_br_b, imagecoord_b);
+    vec2 pos2 = mix(u_pattern_tl_b / u_texsize, u_pattern_br_b / u_texsize, imagecoord_b);
     vec4 color2 = texture2D(u_image, pos2);
 
     vec4 mixedColor = mix(color1, color2, u_mix);
diff --git a/src/shaders/fill_outline_pattern.fragment.glsl b/src/shaders/fill_outline_pattern.fragment.glsl
index 2c95c4c2e80..8346d5a9ccd 100644
--- a/src/shaders/fill_outline_pattern.fragment.glsl
+++ b/src/shaders/fill_outline_pattern.fragment.glsl
@@ -2,6 +2,7 @@ uniform vec2 u_pattern_tl_a;
 uniform vec2 u_pattern_br_a;
 uniform vec2 u_pattern_tl_b;
 uniform vec2 u_pattern_br_b;
+uniform vec2 u_texsize;
 uniform float u_mix;
 
 uniform sampler2D u_image;
@@ -16,11 +17,11 @@ void main() {
     #pragma mapbox: initialize lowp float opacity
 
     vec2 imagecoord = mod(v_pos_a, 1.0);
-    vec2 pos = mix(u_pattern_tl_a, u_pattern_br_a, imagecoord);
+    vec2 pos = mix(u_pattern_tl_a / u_texsize, u_pattern_br_a / u_texsize, imagecoord);
     vec4 color1 = texture2D(u_image, pos);
 
     vec2 imagecoord_b = mod(v_pos_b, 1.0);
-    vec2 pos2 = mix(u_pattern_tl_b, u_pattern_br_b, imagecoord_b);
+    vec2 pos2 = mix(u_pattern_tl_b / u_texsize, u_pattern_br_b / u_texsize, imagecoord_b);
     vec4 color2 = texture2D(u_image, pos2);
 
     // find distance to outline for alpha interpolation
diff --git a/src/shaders/fill_pattern.fragment.glsl b/src/shaders/fill_pattern.fragment.glsl
index 18527cb492e..05b6cc729f1 100644
--- a/src/shaders/fill_pattern.fragment.glsl
+++ b/src/shaders/fill_pattern.fragment.glsl
@@ -2,6 +2,7 @@ uniform vec2 u_pattern_tl_a;
 uniform vec2 u_pattern_br_a;
 uniform vec2 u_pattern_tl_b;
 uniform vec2 u_pattern_br_b;
+uniform vec2 u_texsize;
 uniform float u_mix;
 
 uniform sampler2D u_image;
@@ -15,11 +16,11 @@ void main() {
     #pragma mapbox: initialize lowp float opacity
 
     vec2 imagecoord = mod(v_pos_a, 1.0);
-    vec2 pos = mix(u_pattern_tl_a, u_pattern_br_a, imagecoord);
+    vec2 pos = mix(u_pattern_tl_a / u_texsize, u_pattern_br_a / u_texsize, imagecoord);
     vec4 color1 = texture2D(u_image, pos);
 
     vec2 imagecoord_b = mod(v_pos_b, 1.0);
-    vec2 pos2 = mix(u_pattern_tl_b, u_pattern_br_b, imagecoord_b);
+    vec2 pos2 = mix(u_pattern_tl_b / u_texsize, u_pattern_br_b / u_texsize, imagecoord_b);
     vec4 color2 = texture2D(u_image, pos2);
 
     gl_FragColor = mix(color1, color2, u_mix) * opacity;
diff --git a/src/shaders/line_pattern.fragment.glsl b/src/shaders/line_pattern.fragment.glsl
index 33003a77442..59aa2495799 100644
--- a/src/shaders/line_pattern.fragment.glsl
+++ b/src/shaders/line_pattern.fragment.glsl
@@ -4,6 +4,7 @@ uniform vec2 u_pattern_tl_a;
 uniform vec2 u_pattern_br_a;
 uniform vec2 u_pattern_tl_b;
 uniform vec2 u_pattern_br_b;
+uniform vec2 u_texsize;
 uniform float u_fade;
 
 uniform sampler2D u_image;
@@ -33,8 +34,8 @@ void main() {
     float x_b = mod(v_linesofar / u_pattern_size_b.x, 1.0);
     float y_a = 0.5 + (v_normal.y * v_width2.s / u_pattern_size_a.y);
     float y_b = 0.5 + (v_normal.y * v_width2.s / u_pattern_size_b.y);
-    vec2 pos_a = mix(u_pattern_tl_a, u_pattern_br_a, vec2(x_a, y_a));
-    vec2 pos_b = mix(u_pattern_tl_b, u_pattern_br_b, vec2(x_b, y_b));
+    vec2 pos_a = mix(u_pattern_tl_a / u_texsize, u_pattern_br_a / u_texsize, vec2(x_a, y_a));
+    vec2 pos_b = mix(u_pattern_tl_b / u_texsize, u_pattern_br_b / u_texsize, vec2(x_b, y_b));
 
     vec4 color = mix(texture2D(u_image, pos_a), texture2D(u_image, pos_b), u_fade);
 
diff --git a/src/shaders/symbol_icon.vertex.glsl b/src/shaders/symbol_icon.vertex.glsl
index fe2f5f6e20b..2cc973c5613 100644
--- a/src/shaders/symbol_icon.vertex.glsl
+++ b/src/shaders/symbol_icon.vertex.glsl
@@ -1,14 +1,17 @@
-
 attribute vec4 a_pos_offset;
+attribute vec2 a_label_pos;
 attribute vec4 a_data;
 
 // icon-size data (see symbol_sdf.vertex.glsl for more)
 attribute vec3 a_size;
 uniform bool u_is_size_zoom_constant;
 uniform bool u_is_size_feature_constant;
-uniform mediump float u_size_t; // used to interpolate between zoom stops when size is a composite function
-uniform mediump float u_size; // used when size is both zoom and feature constant
-uniform mediump float u_layout_size; // used when size is feature constant
+uniform highp float u_size_t; // used to interpolate between zoom stops when size is a composite function
+uniform highp float u_size; // used when size is both zoom and feature constant
+uniform highp float u_layout_size; // used when size is feature constant
+uniform highp float u_camera_to_center_distance;
+uniform highp float u_pitch;
+uniform highp float u_collision_y_stretch;
 
 #pragma mapbox: define lowp float opacity
 
@@ -16,7 +19,7 @@ uniform mediump float u_layout_size; // used when size is feature constant
 uniform mat4 u_matrix;
 
 uniform bool u_is_text;
-uniform mediump float u_zoom;
+uniform highp float u_zoom;
 uniform bool u_rotate_with_map;
 uniform vec2 u_extrude_scale;
 
@@ -32,11 +35,11 @@ void main() {
     vec2 a_offset = a_pos_offset.zw;
 
     vec2 a_tex = a_data.xy;
-    mediump vec2 label_data = unpack_float(a_data[2]);
-    mediump float a_labelminzoom = label_data[0];
-    mediump vec2 a_zoom = unpack_float(a_data[3]);
-    mediump float a_minzoom = a_zoom[0];
-    mediump float a_maxzoom = a_zoom[1];
+    highp vec2 label_data = unpack_float(a_data[2]);
+    highp float a_labelminzoom = label_data[0];
+    highp vec2 a_zoom = unpack_float(a_data[3]);
+    highp float a_minzoom = a_zoom[0];
+    highp float a_maxzoom = a_zoom[1];
 
     float size;
     // In order to accommodate placing labels around corners in
@@ -47,7 +50,7 @@ void main() {
     // currently rendered zoom level if text-size is zoom-dependent.
     // Thus, we compensate for this difference by calculating an adjustment
     // based on the scale of rendered text size relative to layout text size.
-    mediump float layoutSize;
+    highp float layoutSize;
     if (!u_is_size_zoom_constant && !u_is_size_feature_constant) {
         size = mix(a_size[0], a_size[1], u_size_t) / 10.0;
         layoutSize = a_size[2] / 10.0;
@@ -64,12 +67,16 @@ void main() {
 
     float fontScale = u_is_text ? size / 24.0 : size;
 
-    mediump float zoomAdjust = log2(size / layoutSize);
-    mediump float adjustedZoom = (u_zoom - zoomAdjust) * 10.0;
+    highp float zoomAdjust = log2(size / layoutSize);
+    highp float adjustedZoom = (u_zoom - zoomAdjust) * 10.0;
     // result: z = 0 if a_minzoom <= adjustedZoom < a_maxzoom, and 1 otherwise
-    mediump float z = 2.0 - step(a_minzoom, adjustedZoom) - (1.0 - step(a_maxzoom, adjustedZoom));
+    highp float z = 2.0 - step(a_minzoom, adjustedZoom) - (1.0 - step(a_maxzoom, adjustedZoom));
+
+    vec4 projectedPoint = u_matrix * vec4(a_label_pos, 0, 1);
+    highp float camera_to_anchor_distance = projectedPoint.w;
+    highp float perspective_ratio = 1.0 + 0.5*((camera_to_anchor_distance / u_camera_to_center_distance) - 1.0);
 
-    vec2 extrude = fontScale * u_extrude_scale * (a_offset / 64.0);
+    vec2 extrude = fontScale * u_extrude_scale * perspective_ratio * (a_offset / 64.0);
     if (u_rotate_with_map) {
         gl_Position = u_matrix * vec4(a_pos + extrude, 0, 1);
         gl_Position.z += z * gl_Position.w;
@@ -78,5 +85,10 @@ void main() {
     }
 
     v_tex = a_tex / u_texsize;
-    v_fade_tex = vec2(a_labelminzoom / 255.0, 0.0);
+    // See comments in symbol_sdf.vertex
+    highp float incidence_stretch  = camera_to_anchor_distance / (u_camera_to_center_distance * cos(u_pitch));
+    highp float collision_adjustment = max(1.0, incidence_stretch / u_collision_y_stretch);
+
+    highp float perspective_zoom_adjust = floor(log2(perspective_ratio * collision_adjustment) * 10.0);
+    v_fade_tex = vec2((a_labelminzoom + perspective_zoom_adjust) / 255.0, 0.0);
 }
diff --git a/src/shaders/symbol_sdf.vertex.glsl b/src/shaders/symbol_sdf.vertex.glsl
index 90ed1956582..cb5d44f19af 100644
--- a/src/shaders/symbol_sdf.vertex.glsl
+++ b/src/shaders/symbol_sdf.vertex.glsl
@@ -1,6 +1,9 @@
 const float PI = 3.141592653589793;
 
+// NOTE: the a_data attribute in this shader is manually bound (see https://github.com/mapbox/mapbox-gl-js/issues/4607).
+// If removing or renaming a_data, revisit the manual binding in painter.js accordingly.
 attribute vec4 a_pos_offset;
+attribute vec2 a_label_pos;
 attribute vec4 a_data;
 
 // contents of a_size vary based on the type of property value
@@ -14,9 +17,9 @@ attribute vec4 a_data;
 attribute vec3 a_size;
 uniform bool u_is_size_zoom_constant;
 uniform bool u_is_size_feature_constant;
-uniform mediump float u_size_t; // used to interpolate between zoom stops when size is a composite function
-uniform mediump float u_size; // used when size is both zoom and feature constant
-uniform mediump float u_layout_size; // used when size is feature constant
+uniform highp float u_size_t; // used to interpolate between zoom stops when size is a composite function
+uniform highp float u_size; // used when size is both zoom and feature constant
+uniform highp float u_layout_size; // used when size is feature constant
 
 #pragma mapbox: define highp vec4 fill_color
 #pragma mapbox: define highp vec4 halo_color
@@ -28,12 +31,15 @@ uniform mediump float u_layout_size; // used when size is feature constant
 uniform mat4 u_matrix;
 
 uniform bool u_is_text;
-uniform mediump float u_zoom;
+uniform highp float u_zoom;
 uniform bool u_rotate_with_map;
 uniform bool u_pitch_with_map;
-uniform mediump float u_pitch;
-uniform mediump float u_bearing;
-uniform mediump float u_aspect_ratio;
+uniform highp float u_pitch;
+uniform highp float u_bearing;
+uniform highp float u_aspect_ratio;
+uniform highp float u_camera_to_center_distance;
+uniform highp float u_max_camera_distance;
+uniform highp float u_collision_y_stretch;
 uniform vec2 u_extrude_scale;
 
 uniform vec2 u_texsize;
@@ -43,6 +49,18 @@ varying vec2 v_fade_tex;
 varying float v_gamma_scale;
 varying float v_size;
 
+// Used below to move the vertex out of the clip space for when the current
+// zoom is out of the glyph's zoom range.
+highp float clipUnusedGlyphAngles(const highp float render_size,
+                                  const highp float layout_size,
+                                  const highp float min_zoom,
+                                  const highp float max_zoom) {
+    highp float zoom_adjust = log2(render_size / layout_size);
+    highp float adjusted_zoom = (u_zoom - zoom_adjust) * 10.0;
+    // result: 0 if min_zoom <= adjusted_zoom < max_zoom, and 1 otherwise
+    return 2.0 - step(min_zoom, adjusted_zoom) - (1.0 - step(max_zoom, adjusted_zoom));
+}
+
 void main() {
     #pragma mapbox: initialize highp vec4 fill_color
     #pragma mapbox: initialize highp vec4 halo_color
@@ -55,13 +73,12 @@ void main() {
 
     vec2 a_tex = a_data.xy;
 
-    mediump vec2 label_data = unpack_float(a_data[2]);
-    mediump float a_labelminzoom = label_data[0];
-    mediump float a_labelangle = label_data[1];
-
-    mediump vec2 a_zoom = unpack_float(a_data[3]);
-    mediump float a_minzoom = a_zoom[0];
-    mediump float a_maxzoom = a_zoom[1];
+    highp vec2 label_data = unpack_float(a_data[2]);
+    highp float a_labelminzoom = label_data[0];
+    highp float a_lineangle = (label_data[1] / 256.0 * 2.0 * PI);
+    highp vec2 a_zoom = unpack_float(a_data[3]);
+    highp float a_minzoom = a_zoom[0];
+    highp float a_maxzoom = a_zoom[1];
 
     // In order to accommodate placing labels around corners in
     // symbol-placement: line, each glyph in a label could have multiple
@@ -71,7 +88,7 @@ void main() {
     // currently rendered zoom level if text-size is zoom-dependent.
     // Thus, we compensate for this difference by calculating an adjustment
     // based on the scale of rendered text size relative to layout text size.
-    mediump float layoutSize;
+    highp float layoutSize;
     if (!u_is_size_zoom_constant && !u_is_size_feature_constant) {
         v_size = mix(a_size[0], a_size[1], u_size_t) / 10.0;
         layoutSize = a_size[2] / 10.0;
@@ -88,57 +105,78 @@ void main() {
 
     float fontScale = u_is_text ? v_size / 24.0 : v_size;
 
-    mediump float zoomAdjust = log2(v_size / layoutSize);
-    mediump float adjustedZoom = (u_zoom - zoomAdjust) * 10.0;
-    // result: z = 0 if a_minzoom <= adjustedZoom < a_maxzoom, and 1 otherwise
-    // Used below to move the vertex out of the clip space for when the current
-    // zoom is out of the glyph's zoom range.
-    mediump float z = 2.0 - step(a_minzoom, adjustedZoom) - (1.0 - step(a_maxzoom, adjustedZoom));
+    vec4 projectedPoint = u_matrix * vec4(a_label_pos, 0, 1);
+    highp float camera_to_anchor_distance = projectedPoint.w;
+    highp float perspective_ratio = 1.0 + 0.5*((camera_to_anchor_distance / u_camera_to_center_distance) - 1.0);
 
     // pitch-alignment: map
     // rotation-alignment: map | viewport
     if (u_pitch_with_map) {
-        lowp float angle = u_rotate_with_map ? (a_labelangle / 256.0 * 2.0 * PI) : u_bearing;
-        lowp float asin = sin(angle);
-        lowp float acos = cos(angle);
+        highp float angle = u_rotate_with_map ? a_lineangle : u_bearing;
+        highp float asin = sin(angle);
+        highp float acos = cos(angle);
         mat2 RotationMatrix = mat2(acos, asin, -1.0 * asin, acos);
         vec2 offset = RotationMatrix * a_offset;
-        vec2 extrude = fontScale * u_extrude_scale * (offset / 64.0);
+        vec2 extrude = fontScale * u_extrude_scale * perspective_ratio * (offset / 64.0);
+
         gl_Position = u_matrix * vec4(a_pos + extrude, 0, 1);
-        gl_Position.z += z * gl_Position.w;
+        gl_Position.z += clipUnusedGlyphAngles(v_size*perspective_ratio, layoutSize, a_minzoom, a_maxzoom) * gl_Position.w;
     // pitch-alignment: viewport
     // rotation-alignment: map
     } else if (u_rotate_with_map) {
         // foreshortening factor to apply on pitched maps
         // as a label goes from horizontal <=> vertical in angle
         // it goes from 0% foreshortening to up to around 70% foreshortening
-        lowp float pitchfactor = 1.0 - cos(u_pitch * sin(u_pitch * 0.75));
-
-        lowp float lineangle = a_labelangle / 256.0 * 2.0 * PI;
+        highp float pitchfactor = 1.0 - cos(u_pitch * sin(u_pitch * 0.75));
 
         // use the lineangle to position points a,b along the line
         // project the points and calculate the label angle in projected space
         // this calculation allows labels to be rendered unskewed on pitched maps
         vec4 a = u_matrix * vec4(a_pos, 0, 1);
-        vec4 b = u_matrix * vec4(a_pos + vec2(cos(lineangle),sin(lineangle)), 0, 1);
-        lowp float angle = atan((b[1]/b[3] - a[1]/a[3])/u_aspect_ratio, b[0]/b[3] - a[0]/a[3]);
-        lowp float asin = sin(angle);
-        lowp float acos = cos(angle);
+        vec4 b = u_matrix * vec4(a_pos + vec2(cos(a_lineangle), sin(a_lineangle)), 0, 1);
+        highp float angle = atan((b[1] / b[3] - a[1] / a[3]) / u_aspect_ratio, b[0] / b[3] - a[0] / a[3]);
+        highp float asin = sin(angle);
+        highp float acos = cos(angle);
         mat2 RotationMatrix = mat2(acos, -1.0 * asin, asin, acos);
+        highp float foreshortening = (1.0 - pitchfactor) + (pitchfactor * cos(angle * 2.0));
+
+        vec2 offset = RotationMatrix * (vec2(foreshortening, 1.0) * a_offset);
+        vec2 extrude = fontScale * u_extrude_scale * perspective_ratio * (offset / 64.0);
 
-        vec2 offset = RotationMatrix * (vec2((1.0-pitchfactor)+(pitchfactor*cos(angle*2.0)), 1.0) * a_offset);
-        vec2 extrude = fontScale * u_extrude_scale * (offset / 64.0);
         gl_Position = u_matrix * vec4(a_pos, 0, 1) + vec4(extrude, 0, 0);
-        gl_Position.z += z * gl_Position.w;
+        gl_Position.z += clipUnusedGlyphAngles(v_size * perspective_ratio, layoutSize, a_minzoom, a_maxzoom) * gl_Position.w;
     // pitch-alignment: viewport
     // rotation-alignment: viewport
     } else {
-        vec2 extrude = fontScale * u_extrude_scale * (a_offset / 64.0);
+        vec2 extrude = fontScale * u_extrude_scale * perspective_ratio * (a_offset / 64.0);
         gl_Position = u_matrix * vec4(a_pos, 0, 1) + vec4(extrude, 0, 0);
     }
 
-    v_gamma_scale = gl_Position.w;
+    gl_Position.z +=
+        step(u_max_camera_distance * u_camera_to_center_distance, camera_to_anchor_distance) * gl_Position.w;
+
+    v_gamma_scale = gl_Position.w / perspective_ratio;
 
     v_tex = a_tex / u_texsize;
-    v_fade_tex = vec2(a_labelminzoom / 255.0, 0.0);
+    // incidence_stretch is the ratio of how much y space a label takes up on a tile while drawn perpendicular to the viewport vs
+    //  how much space it would take up if it were drawn flat on the tile
+    // Using law of sines, camera_to_anchor/sin(ground_angle) = camera_to_center/sin(incidence_angle)
+    // sin(incidence_angle) = 1/incidence_stretch
+    // Incidence angle 90 -> head on, sin(incidence_angle) = 1, no incidence stretch
+    // Incidence angle 1 -> very oblique, sin(incidence_angle) =~ 0, lots of incidence stretch
+    // ground_angle = u_pitch + PI/2 -> sin(ground_angle) = cos(u_pitch)
+    // This 2D calculation is only exactly correct when gl_Position.x is in the center of the viewport,
+    //  but it's a close enough approximation for our purposes
+    highp float incidence_stretch  = camera_to_anchor_distance / (u_camera_to_center_distance * cos(u_pitch));
+    // incidence_stretch only applies to the y-axis, but without re-calculating the collision tile, we can't
+    // adjust the size of only one axis. So, we do a crude approximation at placement time to get the aspect ratio
+    // about right, and then do the rest of the adjustment here: there will be some extra padding on the x-axis,
+    // but hopefully not too much.
+    // Never make the adjustment less than 1.0: instead of allowing collisions on the x-axis, be conservative on
+    // the y-axis.
+    highp float collision_adjustment = max(1.0, incidence_stretch / u_collision_y_stretch);
+
+    // Floor to 1/10th zoom to dodge precision issues that can cause partially hidden labels
+    highp float perspective_zoom_adjust = floor(log2(perspective_ratio * collision_adjustment) * 10.0);
+    v_fade_tex = vec2((a_labelminzoom + perspective_zoom_adjust) / 255.0, 0.0);
 }
diff --git a/src/source/canvas_source.js b/src/source/canvas_source.js
index 8439b09b657..e797ba3439e 100644
--- a/src/source/canvas_source.js
+++ b/src/source/canvas_source.js
@@ -102,7 +102,7 @@ class CanvasSource extends ImageSource {
         }
         if (this._hasInvalidDimensions()) return;
 
-        if (!this.tile) return; // not enough data for current position
+        if (Object.keys(this.tiles).length === 0) return; // not enough data for current position
         this._prepareImage(this.map.painter.gl, this.canvas, resize);
     }
 
diff --git a/src/source/geojson_source.js b/src/source/geojson_source.js
index 7517812cd4c..6eaa669e9a8 100644
--- a/src/source/geojson_source.js
+++ b/src/source/geojson_source.js
@@ -175,6 +175,8 @@ class GeoJSONSource extends Evented {
             overscaling: overscaling,
             angle: this.map.transform.angle,
             pitch: this.map.transform.pitch,
+            cameraToCenterDistance: this.map.transform.cameraToCenterDistance,
+            cameraToTileDistance: this.map.transform.cameraToTileDistance(tile),
             showCollisionBoxes: this.map.showCollisionBoxes
         };
 
diff --git a/src/source/image_source.js b/src/source/image_source.js
index 6946595d3bc..2de718c8905 100644
--- a/src/source/image_source.js
+++ b/src/source/image_source.js
@@ -54,10 +54,12 @@ class ImageSource extends Evented {
         this.minzoom = 0;
         this.maxzoom = 22;
         this.tileSize = 512;
+        this.tiles = {};
 
         this.setEventedParent(eventedParent);
 
         this.options = options;
+        this.textureLoaded = false;
     }
 
     load() {
@@ -140,7 +142,7 @@ class ImageSource extends Evented {
     }
 
     _setTile(tile) {
-        this.tile = tile;
+        this.tiles[tile.coord.w] = tile;
         const maxInt16 = 32767;
         const array = new RasterBoundsArray();
         array.emplaceBack(this._tileCoords[0].x, this._tileCoords[0].y, 0, 0);
@@ -148,22 +150,22 @@ class ImageSource extends Evented {
         array.emplaceBack(this._tileCoords[3].x, this._tileCoords[3].y, 0, maxInt16);
         array.emplaceBack(this._tileCoords[2].x, this._tileCoords[2].y, maxInt16, maxInt16);
 
-        this.tile.buckets = {};
+        tile.buckets = {};
 
-        this.tile.boundsBuffer = Buffer.fromStructArray(array, Buffer.BufferType.VERTEX);
-        this.tile.boundsVAO = new VertexArrayObject();
+        tile.boundsBuffer = Buffer.fromStructArray(array, Buffer.BufferType.VERTEX);
+        tile.boundsVAO = new VertexArrayObject();
     }
 
     prepare() {
-        if (!this.tile || !this.image) return;
+        if (Object.keys(this.tiles).length === 0 === 0 || !this.image) return;
         this._prepareImage(this.map.painter.gl, this.image);
     }
 
     _prepareImage(gl, image, resize) {
-        if (this.tile.state !== 'loaded') {
-            this.tile.state = 'loaded';
-            this.tile.texture = gl.createTexture();
-            gl.bindTexture(gl.TEXTURE_2D, this.tile.texture);
+        if (!this.textureLoaded) {
+            this.textureLoaded = true;
+            this.texture = gl.createTexture();
+            gl.bindTexture(gl.TEXTURE_2D, this.texture);
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
@@ -172,9 +174,17 @@ class ImageSource extends Evented {
         } else if (resize) {
             gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
         } else if (image instanceof window.HTMLVideoElement || image instanceof window.ImageData || image instanceof window.HTMLCanvasElement) {
-            gl.bindTexture(gl.TEXTURE_2D, this.tile.texture);
+            gl.bindTexture(gl.TEXTURE_2D, this.texture);
             gl.texSubImage2D(gl.TEXTURE_2D, 0, 0, 0, gl.RGBA, gl.UNSIGNED_BYTE, image);
         }
+
+        for (const w in this.tiles) {
+            const tile = this.tiles[w];
+            if (tile.state !== 'loaded') {
+                tile.state = 'loaded';
+                tile.texture = this.texture;
+            }
+        }
     }
 
     loadTile(tile, callback) {
@@ -182,6 +192,8 @@ class ImageSource extends Evented {
         // covers the image we want to render.  If that's the one being
         // requested, set it up with the image; otherwise, mark the tile as
         // `errored` to indicate that we have no data for it.
+        // If the world wraps, we may have multiple "wrapped" copies of the
+        // single tile.
         if (this.coord && this.coord.toString() === tile.coord.toString()) {
             this._setTile(tile);
             callback(null);
diff --git a/src/source/query_features.js b/src/source/query_features.js
index 473492f0c2e..9fae1ca590d 100644
--- a/src/source/query_features.js
+++ b/src/source/query_features.js
@@ -11,13 +11,15 @@ exports.rendered = function(sourceCache, styleLayers, queryGeometry, params, zoo
         const tileIn = tilesIn[r];
         if (!tileIn.tile.featureIndex) continue;
 
-        renderedFeatureLayers.push(tileIn.tile.featureIndex.query({
-            queryGeometry: tileIn.queryGeometry,
-            scale: tileIn.scale,
-            tileSize: tileIn.tile.tileSize,
-            bearing: bearing,
-            params: params
-        }, styleLayers));
+        renderedFeatureLayers.push({
+            wrappedTileID: tileIn.coord.wrapped().id,
+            queryResults: tileIn.tile.featureIndex.query({
+                queryGeometry: tileIn.queryGeometry,
+                scale: tileIn.scale,
+                tileSize: tileIn.tile.tileSize,
+                bearing: bearing,
+                params: params
+            }, styleLayers)});
     }
     return mergeRenderedFeatureLayers(renderedFeatureLayers);
 };
@@ -49,21 +51,25 @@ function sortTilesIn(a, b) {
 }
 
 function mergeRenderedFeatureLayers(tiles) {
-    const result = tiles[0] || {};
-    for (let i = 1; i < tiles.length; i++) {
-        const tile = tiles[i];
-        for (const layerID in tile) {
-            const tileFeatures = tile[layerID];
-            let resultFeatures = result[layerID];
-            if (resultFeatures === undefined) {
-                resultFeatures = result[layerID] = tileFeatures;
-            } else {
-                for (let f = 0; f < tileFeatures.length; f++) {
-                    resultFeatures.push(tileFeatures[f]);
+    // Merge results from all tiles, but if two tiles share the same
+    // wrapped ID, don't duplicate features between the two tiles
+    const result = {};
+    const wrappedIDLayerMap = {};
+    for (const tile of tiles) {
+        const queryResults = tile.queryResults;
+        const wrappedID = tile.wrappedTileID;
+        const wrappedIDLayers = wrappedIDLayerMap[wrappedID] = wrappedIDLayerMap[wrappedID] || {};
+        for (const layerID in queryResults) {
+            const tileFeatures = queryResults[layerID];
+            const wrappedIDFeatures = wrappedIDLayers[layerID] = wrappedIDLayers[layerID] || {};
+            const resultFeatures = result[layerID] = result[layerID] || [];
+            for (const tileFeature of tileFeatures) {
+                if (!wrappedIDFeatures[tileFeature.featureIndex]) {
+                    wrappedIDFeatures[tileFeature.featureIndex] = true;
+                    resultFeatures.push(tileFeature.feature);
                 }
             }
         }
     }
     return result;
 }
-
diff --git a/src/source/source_cache.js b/src/source/source_cache.js
index b09075b659a..4ab8b4745e3 100644
--- a/src/source/source_cache.js
+++ b/src/source/source_cache.js
@@ -213,7 +213,7 @@ class SourceCache extends Evented {
      * Recursively find children of the given tile (up to maxCoveringZoom) that are already loaded;
      * adds found tiles to retain object; returns true if any child is found.
      *
-     * @param {Coordinate} coord
+     * @param {TileCoord} coord
      * @param {number} maxCoveringZoom
      * @param {boolean} retain
      * @returns {boolean} whether the operation was complete
@@ -256,7 +256,7 @@ class SourceCache extends Evented {
      * Find a loaded parent of the given tile (up to minCoveringZoom);
      * adds the found tile to retain object and returns the tile if found
      *
-     * @param {Coordinate} coord
+     * @param {TileCoord} coord
      * @param {number} minCoveringZoom
      * @param {boolean} retain
      * @returns {Tile} tile object
@@ -407,39 +407,35 @@ class SourceCache extends Evented {
 
     /**
      * Add a tile, given its coordinate, to the pyramid.
-     * @param {Coordinate} coord
-     * @returns {Coordinate} the coordinate.
+     * @param {TileCoord} tileCoord
+     * @returns {Tile} the added Tile.
      * @private
      */
-    addTile(coord) {
-        let tile = this._tiles[coord.id];
+    addTile(tileCoord) {
+        let tile = this._tiles[tileCoord.id];
         if (tile)
             return tile;
 
-        const wrapped = coord.wrapped();
-        tile = this._tiles[wrapped.id];
-
-        if (!tile) {
-            tile = this._cache.get(wrapped.id);
-            if (tile) {
-                tile.redoPlacement(this._source);
-                if (this._cacheTimers[wrapped.id]) {
-                    clearTimeout(this._cacheTimers[wrapped.id]);
-                    this._cacheTimers[wrapped.id] = undefined;
-                    this._setTileReloadTimer(wrapped.id, tile);
-                }
+        tile = this._cache.get(tileCoord.id);
+        if (tile) {
+            tile.redoPlacement(this._source);
+            if (this._cacheTimers[tileCoord.id]) {
+                clearTimeout(this._cacheTimers[tileCoord.id]);
+                this._cacheTimers[tileCoord.id] = undefined;
+                this._setTileReloadTimer(tileCoord.id, tile);
             }
         }
+
         const cached = Boolean(tile);
         if (!cached) {
-            const zoom = coord.z;
+            const zoom = tileCoord.z;
             const overscaling = zoom > this._source.maxzoom ? Math.pow(2, zoom - this._source.maxzoom) : 1;
-            tile = new Tile(wrapped, this._source.tileSize * overscaling, this._source.maxzoom);
-            this.loadTile(tile, this._tileLoaded.bind(this, tile, coord.id, tile.state));
+            tile = new Tile(tileCoord, this._source.tileSize * overscaling, this._source.maxzoom);
+            this.loadTile(tile, this._tileLoaded.bind(this, tile, tileCoord.id, tile.state));
         }
 
         tile.uses++;
-        this._tiles[coord.id] = tile;
+        this._tiles[tileCoord.id] = tile;
         if (!cached) this._source.fire('dataloading', {tile: tile, coord: tile.coord, dataType: 'source'});
 
         return tile;
@@ -486,6 +482,8 @@ class SourceCache extends Evented {
         if (tile.uses > 0)
             return;
 
+        tile.stopPlacementThrottler();
+
         if (tile.hasData()) {
             const wrappedId = tile.coord.wrapped().id;
             this._cache.add(wrappedId, tile);
@@ -515,7 +513,7 @@ class SourceCache extends Evented {
      * @private
      */
     tilesIn(queryGeometry) {
-        const tileResults = {};
+        const tileResults = [];
         const ids = this.getIds();
 
         let minX = Infinity;
@@ -532,6 +530,7 @@ class SourceCache extends Evented {
             maxY = Math.max(maxY, p.row);
         }
 
+
         for (let i = 0; i < ids.length; i++) {
             const tile = this._tiles[ids[i]];
             const coord = TileCoord.fromID(ids[i]);
@@ -549,26 +548,16 @@ class SourceCache extends Evented {
                     tileSpaceQueryGeometry.push(coordinateToTilePoint(coord, tile.sourceMaxZoom, queryGeometry[j]));
                 }
 
-                let tileResult = tileResults[tile.coord.id];
-                if (tileResult === undefined) {
-                    tileResult = tileResults[tile.coord.id] = {
-                        tile: tile,
-                        coord: coord,
-                        queryGeometry: [],
-                        scale: Math.pow(2, this.transform.zoom - tile.coord.z)
-                    };
-                }
-
-                // Wrapped tiles share one tileResult object but can have multiple queryGeometry parts
-                tileResult.queryGeometry.push(tileSpaceQueryGeometry);
+                tileResults.push({
+                    tile: tile,
+                    coord: coord,
+                    queryGeometry: [tileSpaceQueryGeometry],
+                    scale: Math.pow(2, this.transform.zoom - tile.coord.z)
+                });
             }
         }
 
-        const results = [];
-        for (const t in tileResults) {
-            results.push(tileResults[t]);
-        }
-        return results;
+        return tileResults;
     }
 
     redoPlacement() {
@@ -593,7 +582,8 @@ SourceCache.maxUnderzooming = 3;
 
 /**
  * Convert a coordinate to a point in a tile's coordinate space.
- * @param {Coordinate} tileCoord
+ * @param {TileCoord} tileCoord
+ * @param {number} sourceMaxZoom
  * @param {Coordinate} coord
  * @returns {Object} position
  * @private
diff --git a/src/source/tile.js b/src/source/tile.js
index 7b13a62aba7..be9110a14ee 100644
--- a/src/source/tile.js
+++ b/src/source/tile.js
@@ -9,6 +9,7 @@ const GeoJSONFeature = require('../util/vectortile_to_geojson');
 const featureFilter = require('../style-spec/feature_filter');
 const CollisionTile = require('../symbol/collision_tile');
 const CollisionBoxArray = require('../symbol/collision_box');
+const Throttler = require('../util/throttler');
 
 const CLOCK_SKEW_RETRY_TIMEOUT = 30000;
 
@@ -20,7 +21,7 @@ const CLOCK_SKEW_RETRY_TIMEOUT = 30000;
  */
 class Tile {
     /**
-     * @param {Coordinate} coord
+     * @param {TileCoord} coord
      * @param {number} size
      */
     constructor(coord, size, sourceMaxZoom) {
@@ -47,6 +48,8 @@ class Tile {
         // - `errored`:   Tile data was not loaded because of an error.
         // - `expired`:   Tile data was previously loaded, but has expired per its HTTP headers and is in the process of refreshing.
         this.state = 'loading';
+
+        this.placementThrottler = new Throttler(300, this._immediateRedoPlacement.bind(this));
     }
 
     registerFadeDuration(animationLoop, duration) {
@@ -144,26 +147,56 @@ class Tile {
             return;
         }
 
+        const cameraToTileDistance = source.map.transform.cameraToTileDistance(this);
+        if (this.angle === source.map.transform.angle &&
+            this.pitch === source.map.transform.pitch &&
+            this.cameraToCenterDistance === source.map.transform.cameraToCenterDistance &&
+            this.showCollisionBoxes === source.map.showCollisionBoxes) {
+            if (this.cameraToTileDistance === cameraToTileDistance) {
+                return;
+            } else if (this.pitch < 25) {
+                // At low pitch tile distance doesn't affect placement very
+                // much, so we skip the cost of redoPlacement
+                // However, we might as well store the latest value of
+                // cameraToTileDistance in case a redoPlacement request
+                // is already queued.
+                this.cameraToTileDistance = cameraToTileDistance;
+                return;
+            }
+        }
+
+        this.angle = source.map.transform.angle;
+        this.pitch = source.map.transform.pitch;
+        this.cameraToCenterDistance = source.map.transform.cameraToCenterDistance;
+        this.cameraToTileDistance = cameraToTileDistance;
+        this.showCollisionBoxes = source.map.showCollisionBoxes;
+        this.placementSource = source;
+
         this.state = 'reloading';
+        this.placementThrottler.invoke();
+    }
 
-        source.dispatcher.send('redoPlacement', {
-            type: source.type,
+    _immediateRedoPlacement() {
+        this.placementSource.dispatcher.send('redoPlacement', {
+            type: this.placementSource.type,
             uid: this.uid,
-            source: source.id,
-            angle: source.map.transform.angle,
-            pitch: source.map.transform.pitch,
-            showCollisionBoxes: source.map.showCollisionBoxes
+            source: this.placementSource.id,
+            angle: this.angle,
+            pitch: this.pitch,
+            cameraToCenterDistance: this.cameraToCenterDistance,
+            cameraToTileDistance: this.cameraToTileDistance,
+            showCollisionBoxes: this.showCollisionBoxes
         }, (_, data) => {
-            this.reloadSymbolData(data, source.map.style);
-
+            this.reloadSymbolData(data, this.placementSource.map.style);
+            if (this.placementSource.map.showCollisionBoxes) this.placementSource.fire('data', {tile: this, coord: this.coord, dataType: 'source'});
             // HACK this is nescessary to fix https://github.com/mapbox/mapbox-gl-js/issues/2986
-            if (source.map) source.map.painter.tileExtentVAO.vao = null;
+            if (this.placementSource.map) this.placementSource.map.painter.tileExtentVAO.vao = null;
 
             this.state = 'loaded';
 
             if (this.redoWhenDone) {
                 this.redoWhenDone = false;
-                this.redoPlacement(source);
+                this._immediateRedoPlacement();
             }
         }, this.workerID);
     }
@@ -259,6 +292,13 @@ class Tile {
             }
         }
     }
+
+    stopPlacementThrottler() {
+        this.placementThrottler.stop();
+        if (this.state === 'reloading') {
+            this.state = 'loaded';
+        }
+    }
 }
 
 module.exports = Tile;
diff --git a/src/source/vector_tile_source.js b/src/source/vector_tile_source.js
index c554b1ad901..b81e4622dd2 100644
--- a/src/source/vector_tile_source.js
+++ b/src/source/vector_tile_source.js
@@ -84,6 +84,8 @@ class VectorTileSource extends Evented {
             overscaling: overscaling,
             angle: this.map.transform.angle,
             pitch: this.map.transform.pitch,
+            cameraToCenterDistance: this.map.transform.cameraToCenterDistance,
+            cameraToTileDistance: this.map.transform.cameraToTileDistance(tile),
             showCollisionBoxes: this.map.showCollisionBoxes
         };
 
diff --git a/src/source/vector_tile_worker_source.js b/src/source/vector_tile_worker_source.js
index c0c4ffe30c5..23c3d008b4f 100644
--- a/src/source/vector_tile_worker_source.js
+++ b/src/source/vector_tile_worker_source.js
@@ -39,6 +39,8 @@ class VectorTileWorkerSource {
      * @param {number} params.overscaling
      * @param {number} params.angle
      * @param {number} params.pitch
+     * @param {number} params.cameraToCenterDistance
+     * @param {number} params.cameraToTileDistance
      * @param {boolean} params.showCollisionBoxes
      */
     loadTile(params, callback) {
@@ -184,7 +186,7 @@ class VectorTileWorkerSource {
 
         if (loaded && loaded[uid]) {
             const workerTile = loaded[uid];
-            const result = workerTile.redoPlacement(params.angle, params.pitch, params.showCollisionBoxes);
+            const result = workerTile.redoPlacement(params.angle, params.pitch, params.cameraToCenterDistance, params.cameraToTileDistance, params.showCollisionBoxes);
 
             if (result.result) {
                 callback(null, result.result, result.transferables);
diff --git a/src/source/video_source.js b/src/source/video_source.js
index b1155c727cc..5e4ee61fbf5 100644
--- a/src/source/video_source.js
+++ b/src/source/video_source.js
@@ -107,7 +107,7 @@ class VideoSource extends ImageSource {
     // setCoordinates inherited from ImageSource
 
     prepare() {
-        if (!this.tile || this.video.readyState < 2) return; // not enough data for current position
+        if (Object.keys(this.tiles).length === 0 || this.video.readyState < 2) return; // not enough data for current position
         this._prepareImage(this.map.painter.gl, this.video);
     }
 
diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
index b91421f9ce8..2a0b662e707 100644
--- a/src/source/worker_tile.js
+++ b/src/source/worker_tile.js
@@ -17,6 +17,8 @@ class WorkerTile {
         this.overscaling = params.overscaling;
         this.angle = params.angle;
         this.pitch = params.pitch;
+        this.cameraToCenterDistance = params.cameraToCenterDistance;
+        this.cameraToTileDistance = params.cameraToTileDistance;
         this.showCollisionBoxes = params.showCollisionBoxes;
     }
 
@@ -126,7 +128,7 @@ class WorkerTile {
         }
 
         if (this.symbolBuckets.length === 0) {
-            return done(new CollisionTile(this.angle, this.pitch, this.collisionBoxArray));
+            return done(new CollisionTile(this.angle, this.pitch, this.cameraToCenterDistance, this.cameraToTileDistance, this.collisionBoxArray));
         }
 
         let deps = 0;
@@ -137,7 +139,11 @@ class WorkerTile {
             if (err) return callback(err);
             deps++;
             if (deps === 2) {
-                const collisionTile = new CollisionTile(this.angle, this.pitch, this.collisionBoxArray);
+                const collisionTile = new CollisionTile(this.angle,
+                                                        this.pitch,
+                                                        this.cameraToCenterDistance,
+                                                        this.cameraToTileDistance,
+                                                        this.collisionBoxArray);
 
                 for (const bucket of this.symbolBuckets) {
                     recalculateLayers(bucket, this.zoom);
@@ -169,15 +175,21 @@ class WorkerTile {
         }
     }
 
-    redoPlacement(angle, pitch, showCollisionBoxes) {
+    redoPlacement(angle, pitch, cameraToCenterDistance, cameraToTileDistance, showCollisionBoxes) {
         this.angle = angle;
         this.pitch = pitch;
+        this.cameraToCenterDistance = cameraToCenterDistance;
+        this.cameraToTileDistance = cameraToTileDistance;
 
         if (this.status !== 'done') {
             return {};
         }
 
-        const collisionTile = new CollisionTile(this.angle, this.pitch, this.collisionBoxArray);
+        const collisionTile = new CollisionTile(this.angle,
+                                                this.pitch,
+                                                this.cameraToCenterDistance,
+                                                this.cameraToTileDistance,
+                                                this.collisionBoxArray);
 
         for (const bucket of this.symbolBuckets) {
             recalculateLayers(bucket, this.zoom);
diff --git a/src/style-spec/error/validation_error.js b/src/style-spec/error/validation_error.js
index 5a55e34652e..dce87fab40d 100644
--- a/src/style-spec/error/validation_error.js
+++ b/src/style-spec/error/validation_error.js
@@ -2,11 +2,8 @@
 
 const format = require('util').format;
 
-function ValidationError(key, value /*, message, ...*/) {
-    this.message = (
-        (key ? `${key}: ` : '') +
-        format.apply(format, Array.prototype.slice.call(arguments, 2))
-    );
+function ValidationError(key, value, ...args) {
+    this.message = (key ? `${key}: ` : '') + format.apply(format, args);
 
     if (value !== null && value !== undefined && value.__line__) {
         this.line = value.__line__;
diff --git a/src/style-spec/function/index.js b/src/style-spec/function/index.js
index 1a72e9de524..7a22b919cbe 100644
--- a/src/style-spec/function/index.js
+++ b/src/style-spec/function/index.js
@@ -196,9 +196,9 @@ function evaluateExponentialFunction(parameters, propertySpec, input) {
     const interp = interpolate[propertySpec.type] || identityFunction;
 
     if (typeof outputLower === 'function') {
-        return function() {
-            const evaluatedLower = outputLower.apply(undefined, arguments);
-            const evaluatedUpper = outputUpper.apply(undefined, arguments);
+        return function(...args) {
+            const evaluatedLower = outputLower.apply(undefined, args);
+            const evaluatedUpper = outputUpper.apply(undefined, args);
             // Special case for fill-outline-color, which has no spec default.
             if (evaluatedLower === undefined || evaluatedUpper === undefined) {
                 return undefined;
diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json
index 2da93cc484b..74da0b212f0 100644
--- a/src/style-spec/reference/v8.json
+++ b/src/style-spec/reference/v8.json
@@ -1705,6 +1705,9 @@
         }
       },
       "transition": false,
+      "zoom-function": true,
+      "property-function": false,
+      "function": "piecewise-constant",
       "doc": "Whether extruded geometries are lit relative to the map or viewport.",
       "example": "map",
       "sdk-support": {
diff --git a/src/style-spec/util/extend.js b/src/style-spec/util/extend.js
index a3a746cad40..3e1efd69ccb 100644
--- a/src/style-spec/util/extend.js
+++ b/src/style-spec/util/extend.js
@@ -1,8 +1,7 @@
 'use strict';
 
-module.exports = function (output) {
-    for (let i = 1; i < arguments.length; i++) {
-        const input = arguments[i];
+module.exports = function (output, ...inputs) {
+    for (const input of inputs) {
         for (const k in input) {
             output[k] = input[k];
         }
diff --git a/src/symbol/collision_feature.js b/src/symbol/collision_feature.js
index b9be1f03718..bbc42d66765 100644
--- a/src/symbol/collision_feature.js
+++ b/src/symbol/collision_feature.js
@@ -72,34 +72,52 @@ class CollisionFeature {
     _addLineCollisionBoxes(collisionBoxArray, line, anchor, segment, labelLength, boxSize, featureIndex, sourceLayerIndex, bucketIndex) {
         const step = boxSize / 2;
         const nBoxes = Math.floor(labelLength / step);
+        // We calculate line collision boxes out to 150% of what would normally be our
+        // max size, to allow collision detection to work on labels that expand as
+        // they move into the distance
+        const nPitchPaddingBoxes = Math.floor(nBoxes / 4);
 
         // offset the center of the first box by half a box so that the edge of the
         // box is at the edge of the label.
         const firstBoxOffset = -boxSize / 2;
 
-        const bboxes = this.boxes;
-
         let p = anchor;
         let index = segment + 1;
         let anchorDistance = firstBoxOffset;
+        const labelStartDistance = -labelLength / 2;
+        const paddingStartDistance = labelStartDistance - labelLength / 8;
 
         // move backwards along the line to the first segment the label appears on
         do {
             index--;
 
-            // there isn't enough room for the label after the beginning of the line
-            // checkMaxAngle should have already caught this
-            if (index < 0) return bboxes;
-
-            anchorDistance -= line[index].dist(p);
-            p = line[index];
-        } while (anchorDistance > -labelLength / 2);
+            if (index < 0) {
+                if (anchorDistance > labelStartDistance) {
+                    // there isn't enough room for the label after the beginning of the line
+                    // checkMaxAngle should have already caught this
+                    return;
+                } else {
+                    // The line doesn't extend far enough back for all of our padding,
+                    // but we got far enough to show the label under most conditions.
+                    index = 0;
+                    break;
+                }
+            } else {
+                anchorDistance -= line[index].dist(p);
+                p = line[index];
+            }
+        } while (anchorDistance > paddingStartDistance);
 
         let segmentLength = line[index].dist(line[index + 1]);
 
-        for (let i = 0; i < nBoxes; i++) {
+        for (let i = -nPitchPaddingBoxes; i < nBoxes + nPitchPaddingBoxes; i++) {
             // the distance the box will be from the anchor
-            const boxDistanceToAnchor = -labelLength / 2 + i * step;
+            const boxDistanceToAnchor = labelStartDistance + i * step;
+            if (boxDistanceToAnchor < anchorDistance) {
+                // The line doesn't extend far enough back for this box, skip it
+                // (This could allow for line collisions on distant tiles)
+                continue;
+            }
 
             // the box is not on the current segment. Move to the next segment.
             while (anchorDistance + segmentLength < boxDistanceToAnchor) {
@@ -107,7 +125,7 @@ class CollisionFeature {
                 index++;
 
                 // There isn't enough room before the end of the line.
-                if (index + 1 >= line.length) return bboxes;
+                if (index + 1 >= line.length) return;
 
                 segmentLength = line[index].dist(line[index + 1]);
             }
@@ -119,16 +137,35 @@ class CollisionFeature {
             const p1 = line[index + 1];
             const boxAnchorPoint = p1.sub(p0)._unit()._mult(segmentBoxDistance)._add(p0)._round();
 
+            // Distance from label anchor point to inner (towards center) edge of this box
+            // The tricky thing here is that box positioning doesn't change with scale,
+            // but box size does change with scale.
+            // Technically, distanceToInnerEdge should be:
+            // Math.max(Math.abs(boxDistanceToAnchor - firstBoxOffset) - (step / scale), 0);
+            // But using that formula would make solving for maxScale more difficult, so we
+            // approximate with scale=2.
+            // This makes our calculation spot-on at scale=2, and on the conservative side for
+            // lower scales
             const distanceToInnerEdge = Math.max(Math.abs(boxDistanceToAnchor - firstBoxOffset) - step / 2, 0);
-            const maxScale = labelLength / 2 / distanceToInnerEdge;
+            let maxScale = labelLength / 2 / distanceToInnerEdge;
+
+            // The box maxScale calculations are designed to be conservative on collisions in the scale range
+            // [1,2]. At scale=1, each box has 50% overlap, and at scale=2, the boxes are lined up edge
+            // to edge (beyond scale 2, gaps start to appear, which could potentially allow missed collisions).
+            // We add "pitch padding" boxes to the left and right to handle effective underzooming
+            // (scale < 1) when labels are in the distance. The overlap approximation could cause us to use
+            // these boxes when the scale is greater than 1, but we prevent that because we know
+            // they're only necessary for scales less than one.
+            // This preserves the pre-pitch-padding behavior for unpitched maps.
+            if (i < 0 || i >= nBoxes) {
+                maxScale = Math.min(maxScale, 0.99);
+            }
 
             collisionBoxArray.emplaceBack(boxAnchorPoint.x, boxAnchorPoint.y,
                     -boxSize / 2, -boxSize / 2, boxSize / 2, boxSize / 2, maxScale,
                     featureIndex, sourceLayerIndex, bucketIndex,
                     0, 0, 0, 0, 0);
         }
-
-        return bboxes;
     }
 }
 
diff --git a/src/symbol/collision_tile.js b/src/symbol/collision_tile.js
index 91ec367668b..705971b6b10 100644
--- a/src/symbol/collision_tile.js
+++ b/src/symbol/collision_tile.js
@@ -14,12 +14,14 @@ const intersectionTests = require('../util/intersection_tests');
  * @private
  */
 class CollisionTile {
-    constructor(angle, pitch, collisionBoxArray) {
+    constructor(angle, pitch, cameraToCenterDistance, cameraToTileDistance, collisionBoxArray) {
         if (typeof angle === 'object') {
             const serialized = angle;
             collisionBoxArray = pitch;
             angle = serialized.angle;
             pitch = serialized.pitch;
+            cameraToCenterDistance = serialized.cameraToCenterDistance;
+            cameraToTileDistance = serialized.cameraToTileDistance;
             this.grid = new Grid(serialized.grid);
             this.ignoredGrid = new Grid(serialized.ignoredGrid);
         } else {
@@ -27,11 +29,18 @@ class CollisionTile {
             this.ignoredGrid = new Grid(EXTENT, 12, 0);
         }
 
-        this.minScale = 0.5;
-        this.maxScale = 2;
+        this.perspectiveRatio = 1 + 0.5 * ((cameraToTileDistance / cameraToCenterDistance) - 1);
+
+        // High perspective ratio means we're effectively "underzooming"
+        // the tile. Adjust the minScale and maxScale range accordingly
+        // to constrain the number of collision calculations
+        this.minScale = .5 / this.perspectiveRatio;
+        this.maxScale = 2 / this.perspectiveRatio;
 
         this.angle = angle;
         this.pitch = pitch;
+        this.cameraToCenterDistance = cameraToCenterDistance;
+        this.cameraToTileDistance = cameraToTileDistance;
 
         const sin = Math.sin(angle),
             cos = Math.cos(angle);
@@ -39,11 +48,14 @@ class CollisionTile {
         this.reverseRotationMatrix = [cos, sin, -sin, cos];
 
         // Stretch boxes in y direction to account for the map tilt.
-        this.yStretch = 1 / Math.cos(pitch / 180 * Math.PI);
-
         // The amount the map is squished depends on the y position.
-        // Sort of account for this by making all boxes a bit bigger.
-        this.yStretch = Math.pow(this.yStretch, 1.3);
+        // We can only approximate here based on the y position of the tile
+        // The shaders calculate a more accurate "incidence_stretch"
+        // at render time to calculate an effective scale for collision
+        // purposes, but we still want to use the yStretch approximation
+        // here because we can't adjust the aspect ratio of the collision
+        // boxes at render time.
+        this.yStretch = Math.max(1, cameraToTileDistance / (cameraToCenterDistance * Math.cos(pitch / 180 * Math.PI)));
 
         this.collisionBoxArray = collisionBoxArray;
         if (collisionBoxArray.length === 0) {
@@ -90,6 +102,8 @@ class CollisionTile {
         return {
             angle: this.angle,
             pitch: this.pitch,
+            cameraToCenterDistance: this.cameraToCenterDistance,
+            cameraToTileDistance: this.cameraToTileDistance,
             grid: grid,
             ignoredGrid: ignoredGrid
         };
@@ -118,10 +132,18 @@ class CollisionTile {
             const x = anchorPoint.x;
             const y = anchorPoint.y;
 
-            const x1 = x + box.x1;
-            const y1 = y + box.y1 * yStretch;
-            const x2 = x + box.x2;
-            const y2 = y + box.y2 * yStretch;
+            // When the 'perspectiveRatio' is high, we're effectively underzooming
+            // the tile because it's in the distance.
+            // In order to detect collisions that only happen while underzoomed,
+            // we have to query a larger portion of the grid.
+            // This extra work is offset by having a lower 'maxScale' bound
+            // Note that this adjustment ONLY affects the bounding boxes
+            // in the grid. It doesn't affect the boxes used for the
+            // minPlacementScale calculations.
+            const x1 = x + box.x1 * this.perspectiveRatio;
+            const y1 = y + box.y1 * yStretch * this.perspectiveRatio;
+            const x2 = x + box.x2 * this.perspectiveRatio;
+            const y2 = y + box.y2 * yStretch * this.perspectiveRatio;
 
             box.bbox0 = x1;
             box.bbox1 = y1;
@@ -181,7 +203,7 @@ class CollisionTile {
         const sourceLayerFeatures = {};
         const result = [];
 
-        if (queryGeometry.length === 0 || (this.grid.length === 0 && this.ignoredGrid.length === 0)) {
+        if (queryGeometry.length === 0 || (this.grid.keys.length === 0 && this.ignoredGrid.keys.length === 0)) {
             return result;
         }
 
@@ -304,14 +326,16 @@ class CollisionTile {
      * @private
      */
     insertCollisionFeature(collisionFeature, minPlacementScale, ignorePlacement) {
-
         const grid = ignorePlacement ? this.ignoredGrid : this.grid;
         const collisionBoxArray = this.collisionBoxArray;
 
         for (let k = collisionFeature.boxStartIndex; k < collisionFeature.boxEndIndex; k++) {
             const box = collisionBoxArray.get(k);
             box.placementScale = minPlacementScale;
-            if (minPlacementScale < this.maxScale) {
+            if (minPlacementScale < this.maxScale &&
+                (this.perspectiveRatio === 1 || box.maxScale >= 1)) {
+                // Boxes with maxScale < 1 are only relevant in pitched maps,
+                // so filter them out in unpitched maps to keep the grid sparse
                 grid.insert(k, box.bbox0, box.bbox1, box.bbox2, box.bbox3);
             }
         }
diff --git a/src/symbol/glyph_atlas.js b/src/symbol/glyph_atlas.js
index c0dbdffe429..c4beadd1b1a 100644
--- a/src/symbol/glyph_atlas.js
+++ b/src/symbol/glyph_atlas.js
@@ -79,14 +79,8 @@ class GlyphAtlas {
 
         // Add a 1px border around every image.
         const padding = 1;
-        let packWidth = bufferedWidth + 2 * padding;
-        let packHeight = bufferedHeight + 2 * padding;
-
-        // Increase to next number divisible by 4, but at least 1.
-        // This is so we can scale down the texture coordinates and pack them
-        // into fewer bytes.
-        packWidth += (4 - packWidth % 4);
-        packHeight += (4 - packHeight % 4);
+        const packWidth = bufferedWidth + 2 * padding;
+        const packHeight = bufferedHeight + 2 * padding;
 
         let rect = this.atlas.packOne(packWidth, packHeight);
         if (!rect) {
diff --git a/src/symbol/quads.js b/src/symbol/quads.js
index 16ce489db34..62e244bd56c 100644
--- a/src/symbol/quads.js
+++ b/src/symbol/quads.js
@@ -59,14 +59,18 @@ function SymbolQuad(anchorPoint, tl, tr, bl, br, tex, anchorAngle, glyphAngle, m
  * @private
  */
 function getIconQuads(anchor, shapedIcon, boxScale, line, layer, alongLine, shapedText, globalProperties, featureProperties) {
-    const rect = shapedIcon.image.rect;
+    const image = shapedIcon.image;
     const layout = layer.layout;
 
+    // If you have a 10px icon that isn't perfectly aligned to the pixel grid it will cover 11 actual
+    // pixels. The quad needs to be padded to account for this, otherwise they'll look slightly clipped
+    // on one edge in some cases.
     const border = 1;
-    const left = shapedIcon.left - border;
-    const right = left + rect.w / shapedIcon.image.pixelRatio;
-    const top = shapedIcon.top - border;
-    const bottom = top + rect.h / shapedIcon.image.pixelRatio;
+
+    const top = shapedIcon.top - border / image.pixelRatio;
+    const left = shapedIcon.left - border / image.pixelRatio;
+    const bottom = shapedIcon.bottom + border / image.pixelRatio;
+    const right = shapedIcon.right + border / image.pixelRatio;
     let tl, tr, br, bl;
 
     // text-fit mode
@@ -122,7 +126,15 @@ function getIconQuads(anchor, shapedIcon, boxScale, line, layer, alongLine, shap
         br = br.matMult(matrix);
     }
 
-    return [new SymbolQuad(new Point(anchor.x, anchor.y), tl, tr, bl, br, shapedIcon.image.rect, 0, 0, minScale, Infinity)];
+    // Icon quad is padded, so texture coordinates also need to be padded.
+    const textureRect = {
+        x: image.textureRect.x - border,
+        y: image.textureRect.y - border,
+        w: image.textureRect.w + border * 2,
+        h: image.textureRect.h + border * 2
+    };
+
+    return [new SymbolQuad(new Point(anchor.x, anchor.y), tl, tr, bl, br, textureRect, 0, 0, minScale, Infinity)];
 }
 
 /**
@@ -147,6 +159,8 @@ function getGlyphQuads(anchor, shaping, boxScale, line, layer, alongLine, global
     const positionedGlyphs = shaping.positionedGlyphs;
     const quads = [];
 
+    let labelMinScale = minScale;
+
     for (let k = 0; k < positionedGlyphs.length; k++) {
         const positionedGlyph = positionedGlyphs[k];
         const glyph = positionedGlyph.glyph;
@@ -158,12 +172,11 @@ function getGlyphQuads(anchor, shaping, boxScale, line, layer, alongLine, global
         const centerX = (positionedGlyph.x + glyph.advance / 2) * boxScale;
 
         let glyphInstances;
-        let labelMinScale = minScale;
         if (alongLine) {
             glyphInstances = [];
-            labelMinScale = getLineGlyphs(glyphInstances, anchor, centerX, line, anchor.segment, false);
+            labelMinScale = Math.max(labelMinScale, getLineGlyphs(glyphInstances, anchor, centerX, line, anchor.segment, false));
             if (keepUpright) {
-                labelMinScale = Math.min(labelMinScale, getLineGlyphs(glyphInstances, anchor, centerX, line, anchor.segment, true));
+                labelMinScale = Math.max(labelMinScale, getLineGlyphs(glyphInstances, anchor, centerX, line, anchor.segment, true));
             }
 
         } else {
diff --git a/src/symbol/shaping.js b/src/symbol/shaping.js
index e2446b0a0ed..20076ea44bc 100644
--- a/src/symbol/shaping.js
+++ b/src/symbol/shaping.js
@@ -310,14 +310,12 @@ function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLin
 }
 
 function shapeIcon(image, iconOffset) {
-    if (!image || !image.rect) return null;
-
     const dx = iconOffset[0];
     const dy = iconOffset[1];
-    const x1 = dx - image.width / 2;
-    const x2 = x1 + image.width;
-    const y1 = dy - image.height / 2;
-    const y2 = y1 + image.height;
+    const x1 = dx - image.displaySize[0] / 2;
+    const x2 = x1 + image.displaySize[0];
+    const y1 = dy - image.displaySize[1] / 2;
+    const y2 = y1 + image.displaySize[1];
 
     return new PositionedIcon(image, y1, y2, x1, x2);
 }
diff --git a/src/symbol/sprite_atlas.js b/src/symbol/sprite_atlas.js
index afcd4477b55..5239941eb41 100644
--- a/src/symbol/sprite_atlas.js
+++ b/src/symbol/sprite_atlas.js
@@ -5,6 +5,37 @@ const browser = require('../util/browser');
 const util = require('../util/util');
 const window = require('../util/window');
 const Evented = require('../util/evented');
+const padding = 1;
+
+// This wants to be a class, but is sent to workers, so must be a plain JSON blob.
+function spriteAtlasElement(image) {
+    const textureRect = {
+        x: image.rect.x + padding,
+        y: image.rect.y + padding,
+        w: image.rect.w - padding * 2,
+        h: image.rect.h - padding * 2
+    };
+    return {
+        sdf: image.sdf,
+        pixelRatio: image.pixelRatio,
+        isNativePixelRatio: image.pixelRatio === browser.devicePixelRatio,
+        textureRect: textureRect,
+
+        // Redundant calculated members.
+        tl: [
+            textureRect.x,
+            textureRect.y
+        ],
+        br: [
+            textureRect.x + textureRect.w,
+            textureRect.y + textureRect.h
+        ],
+        displaySize: [
+            textureRect.w / image.pixelRatio,
+            textureRect.h / image.pixelRatio
+        ]
+    };
+}
 
 // The SpriteAtlas class is responsible for turning a sprite and assorted
 // other images added at runtime into a texture that can be consumed by WebGL.
@@ -12,32 +43,28 @@ class SpriteAtlas extends Evented {
 
     constructor(width, height) {
         super();
-
-        this.width = width;
-        this.height = height;
-
-        this.shelfPack = new ShelfPack(width, height);
         this.images = {};
         this.data = false;
         this.texture = 0; // WebGL ID
         this.filter = 0; // WebGL ID
-        this.pixelRatio = browser.devicePixelRatio > 1 ? 2 : 1;
+        this.width = width * browser.devicePixelRatio;
+        this.height = height * browser.devicePixelRatio;
+        this.shelfPack = new ShelfPack(this.width, this.height);
         this.dirty = true;
     }
 
+    getPixelSize() {
+        return [
+            this.width,
+            this.height
+        ];
+    }
+
     allocateImage(pixelWidth, pixelHeight) {
-        pixelWidth = pixelWidth / this.pixelRatio;
-        pixelHeight = pixelHeight / this.pixelRatio;
-
-        // Increase to next number divisible by 4, but at least 1.
-        // This is so we can scale down the texture coordinates and pack them
-        // into 2 bytes rather than 4 bytes.
-        // Pad icons to prevent them from polluting neighbours during linear interpolation
-        const padding = 2;
-        const packWidth = pixelWidth + padding + (4 - (pixelWidth + padding) % 4);
-        const packHeight = pixelHeight + padding + (4 - (pixelHeight + padding) % 4);// + 4;
-
-        const rect = this.shelfPack.packOne(packWidth, packHeight);
+        const width = pixelWidth + 2 * padding;
+        const height = pixelHeight + 2 * padding;
+
+        const rect = this.shelfPack.packOne(width, height);
         if (!rect) {
             util.warnOnce('SpriteAtlas out of space.');
             return null;
@@ -76,16 +103,15 @@ class SpriteAtlas extends Evented {
             return this.fire('error', {error: new Error('There is not enough space to add this image.')});
         }
 
-        const image = {
+        this.images[name] = {
             rect,
-            width: width / pixelRatio,
-            height: height / pixelRatio,
-            sdf: false,
-            pixelRatio: pixelRatio / this.pixelRatio
+            width,
+            height,
+            pixelRatio,
+            sdf: false
         };
-        this.images[name] = image;
 
-        this.copy(pixels, width, rect, {pixelRatio, x: 0, y: 0, width, height}, false);
+        this.copy(pixels, width, rect, {x: 0, y: 0, width, height}, false);
 
         this.fire('data', {dataType: 'style'});
     }
@@ -102,9 +128,19 @@ class SpriteAtlas extends Evented {
         this.fire('data', {dataType: 'style'});
     }
 
-    getImage(name, wrap) {
+    // Return metrics for an icon image.
+    getIcon(name) {
+        return this._getImage(name, false);
+    }
+
+    // Return metrics for repeating pattern image.
+    getPattern(name) {
+        return this._getImage(name, true);
+    }
+
+    _getImage(name, wrap) {
         if (this.images[name]) {
-            return this.images[name];
+            return spriteAtlasElement(this.images[name]);
         }
 
         if (!this.sprite) {
@@ -123,10 +159,10 @@ class SpriteAtlas extends Evented {
 
         const image = {
             rect,
-            width: pos.width / pos.pixelRatio,
-            height: pos.height / pos.pixelRatio,
+            width: pos.width,
+            height: pos.height,
             sdf: pos.sdf,
-            pixelRatio: pos.pixelRatio / this.pixelRatio
+            pixelRatio: pos.pixelRatio
         };
         this.images[name] = image;
 
@@ -134,34 +170,12 @@ class SpriteAtlas extends Evented {
         const srcImg = new Uint32Array(this.sprite.imgData.buffer);
         this.copy(srcImg, this.sprite.width, rect, pos, wrap);
 
-        return image;
-    }
-
-    // Return position of a repeating fill pattern.
-    getPosition(name, repeating) {
-        const image = this.getImage(name, repeating);
-        const rect = image && image.rect;
-
-        if (!rect) {
-            return null;
-        }
-
-        const width = image.width * image.pixelRatio;
-        const height = image.height * image.pixelRatio;
-        const padding = 1;
-
-        return {
-            size: [image.width, image.height],
-            tl: [(rect.x + padding)         / this.width, (rect.y + padding)          / this.height],
-            br: [(rect.x + padding + width) / this.width, (rect.y + padding + height) / this.height]
-        };
+        return spriteAtlasElement(image);
     }
 
     allocate() {
         if (!this.data) {
-            const w = Math.floor(this.width * this.pixelRatio);
-            const h = Math.floor(this.height * this.pixelRatio);
-            this.data = new Uint32Array(w * h);
+            this.data = new Uint32Array(this.width * this.height);
             for (let i = 0; i < this.data.length; i++) {
                 this.data[i] = 0;
             }
@@ -173,17 +187,15 @@ class SpriteAtlas extends Evented {
         this.allocate();
         const dstImg = this.data;
 
-        const padding = 1;
-
         copyBitmap(
             /* source buffer */  srcImg,
             /* source stride */  srcImgWidth,
             /* source x */       srcPos.x,
             /* source y */       srcPos.y,
             /* dest buffer */    dstImg,
-            /* dest stride */    this.width * this.pixelRatio,
-            /* dest x */         (dstPos.x + padding) * this.pixelRatio,
-            /* dest y */         (dstPos.y + padding) * this.pixelRatio,
+            /* dest stride */    this.getPixelSize()[0],
+            /* dest x */         dstPos.x + padding,
+            /* dest y */         dstPos.y + padding,
             /* icon dimension */ srcPos.width,
             /* icon dimension */ srcPos.height,
             /* wrap */           wrap
@@ -196,18 +208,18 @@ class SpriteAtlas extends Evented {
 
     setSprite(sprite) {
         if (sprite && this.canvas) {
-            this.canvas.width = this.width * this.pixelRatio;
-            this.canvas.height = this.height * this.pixelRatio;
+            this.canvas.width = this.width;
+            this.canvas.height = this.height;
         }
         this.sprite = sprite;
     }
 
     addIcons(icons, callback) {
-        for (let i = 0; i < icons.length; i++) {
-            this.getImage(icons[i]);
+        const result = {};
+        for (const icon of icons) {
+            result[icon] = this.getIcon(icon);
         }
-
-        callback(null, this.images);
+        callback(null, result);
     }
 
     bind(gl, linear) {
@@ -238,8 +250,8 @@ class SpriteAtlas extends Evented {
                     gl.TEXTURE_2D, // enum target
                     0, // ind level
                     gl.RGBA, // ind internalformat
-                    this.width * this.pixelRatio, // GLsizei width
-                    this.height * this.pixelRatio, // GLsizei height
+                    this.width, // GLsizei width
+                    this.height, // GLsizei height
                     0, // ind border
                     gl.RGBA, // enum format
                     gl.UNSIGNED_BYTE, // enum type
@@ -251,8 +263,8 @@ class SpriteAtlas extends Evented {
                     0, // int level
                     0, // int xoffset
                     0, // int yoffset
-                    this.width * this.pixelRatio, // long width
-                    this.height * this.pixelRatio, // long height
+                    this.width, // long width
+                    this.height, // long height
                     gl.RGBA, // enum format
                     gl.UNSIGNED_BYTE, // enum type
                     new Uint8Array(this.data.buffer) // Object pixels
diff --git a/src/ui/camera.js b/src/ui/camera.js
index bbc97ba5caa..3003ea53562 100644
--- a/src/ui/camera.js
+++ b/src/ui/camera.js
@@ -689,7 +689,7 @@ class Camera extends Evented {
             startBearing = this.getBearing(),
             startPitch = this.getPitch();
 
-        const zoom = 'zoom' in options ?  +options.zoom : startZoom;
+        const zoom = 'zoom' in options ? util.clamp(+options.zoom, tr.minZoom, tr.maxZoom) : startZoom;
         const bearing = 'bearing' in options ? this._normalizeBearing(options.bearing, startBearing) : startBearing;
         const pitch = 'pitch' in options ? +options.pitch : startPitch;
 
@@ -758,7 +758,7 @@ class Camera extends Evented {
             S = (r(1) - r0) / rho;
 
         // When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
-        if (Math.abs(u1) < 0.000001) {
+        if (Math.abs(u1) < 0.000001 || isNaN(S)) {
             // Perform a more or less instantaneous transition if the path is too short.
             if (Math.abs(w0 - w1) < 0.000001) return this.easeTo(options, eventData);
 
diff --git a/src/ui/control/attribution_control.js b/src/ui/control/attribution_control.js
index f84d1c038ef..0ce99e81884 100644
--- a/src/ui/control/attribution_control.js
+++ b/src/ui/control/attribution_control.js
@@ -2,6 +2,7 @@
 
 const DOM = require('../../util/dom');
 const util = require('../../util/util');
+const config = require('../../util/config');
 
 /**
  * An `AttributionControl` control presents the map's [attribution information](https://www.mapbox.com/help/attribution/).
@@ -66,14 +67,26 @@ class AttributionControl {
     }
 
     _updateEditLink() {
-        if (!this._editLink) this._editLink = this._container.querySelector('.mapboxgl-improve-map');
+        if (!this._editLink) this._editLink = this._container.querySelector('.mapbox-improve-map');
+        const params = [
+            {key: "owner", value: this.styleOwner},
+            {key: "id", value: this.styleId},
+            {key: "access_token", value: config.ACCESS_TOKEN}
+        ];
+
         if (this._editLink) {
-            const center = this._map.getCenter();
-            this._editLink.href = `https://www.mapbox.com/map-feedback/#/${
-                    center.lng}/${center.lat}/${Math.round(this._map.getZoom() + 1)}`;
+            const paramString = params.reduce((acc, next, i) => {
+                if (next.value !== undefined) {
+                    acc += `${next.key}=${next.value}${i < params.length - 1 ? '&' : ''}`;
+                }
+                return acc;
+            }, `?`);
+            this._editLink.href = `https://www.mapbox.com/feedback/${paramString}${this._map._hash ? this._map._hash.getHashString(true) : ''}`;
+
         }
     }
 
+
     _updateData(e) {
         if (e && e.sourceDataType === 'metadata') {
             this._updateAttributions();
@@ -85,6 +98,12 @@ class AttributionControl {
         if (!this._map.style) return;
         let attributions = [];
 
+        if (this._map.style.stylesheet) {
+            const stylesheet = this._map.style.stylesheet;
+            this.styleOwner = stylesheet.owner;
+            this.styleId = stylesheet.id;
+        }
+
         const sourceCaches = this._map.style.sourceCaches;
         for (const id in sourceCaches) {
             const source = sourceCaches[id].getSource();
diff --git a/src/ui/hash.js b/src/ui/hash.js
index 9068c055d7b..82efb9e0503 100644
--- a/src/ui/hash.js
+++ b/src/ui/hash.js
@@ -42,6 +42,28 @@ class Hash {
         return this;
     }
 
+    getHashString(mapFeedback) {
+        const center = this._map.getCenter(),
+            zoom = Math.round(this._map.getZoom() * 100) / 100,
+            precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)),
+            lng = Math.round(center.lng * Math.pow(10, precision)) / Math.pow(10, precision),
+            lat = Math.round(center.lat * Math.pow(10, precision)) / Math.pow(10, precision),
+            bearing = this._map.getBearing(),
+            pitch = this._map.getPitch();
+        let hash = '';
+        if (mapFeedback) {
+            // new map feedback site has some constraints that don't allow
+            // us to use the same hash format as we do for the Map hash option.
+            hash += `#/${lng}/${lat}/${zoom}`;
+        } else {
+            hash += `#${zoom}/${lat}/${lng}`;
+        }
+
+        if (bearing || pitch) hash += (`/${Math.round(bearing * 10) / 10}`);
+        if (pitch) hash += (`/${Math.round(pitch)}`);
+        return hash;
+    }
+
     _onHashChange() {
         const loc = window.location.hash.replace('#', '').split('/');
         if (loc.length >= 3) {
@@ -57,21 +79,10 @@ class Hash {
     }
 
     _updateHash() {
-        const center = this._map.getCenter(),
-            zoom = this._map.getZoom(),
-            bearing = this._map.getBearing(),
-            pitch = this._map.getPitch(),
-            precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
-
-        let hash = `#${Math.round(zoom * 100) / 100
-                }/${center.lat.toFixed(precision)
-                }/${center.lng.toFixed(precision)}`;
-
-        if (bearing || pitch) hash += (`/${Math.round(bearing * 10) / 10}`);
-        if (pitch) hash += (`/${Math.round(pitch)}`);
-
+        const hash = this.getHashString();
         window.history.replaceState('', '', hash);
     }
+
 }
 
 module.exports = Hash;
diff --git a/src/ui/map.js b/src/ui/map.js
index 315edd95540..8f1e091eb6e 100755
--- a/src/ui/map.js
+++ b/src/ui/map.js
@@ -848,6 +848,7 @@ class Map extends Camera {
             this.style._remove();
             this.off('rotate', this.style._redoPlacement);
             this.off('pitch', this.style._redoPlacement);
+            this.off('move', this.style._redoPlacement);
         }
 
         if (!style) {
@@ -863,6 +864,7 @@ class Map extends Camera {
 
         this.on('rotate', this.style._redoPlacement);
         this.on('pitch', this.style._redoPlacement);
+        this.on('move', this.style._redoPlacement);
 
         return this;
     }
@@ -1328,6 +1330,7 @@ class Map extends Camera {
         event.preventDefault();
         if (this._frameId) {
             browser.cancelFrame(this._frameId);
+            this._frameId = null;
         }
         this.fire('webglcontextlost', {originalEvent: event});
     }
@@ -1460,6 +1463,7 @@ class Map extends Camera {
     remove() {
         if (this._hash) this._hash.remove();
         browser.cancelFrame(this._frameId);
+        this._frameId = null;
         this.setStyle(null);
         if (typeof window !== 'undefined') {
             window.removeEventListener('resize', this._onWindowResize, false);
diff --git a/src/util/is_char_in_unicode_block.js b/src/util/is_char_in_unicode_block.js
index 5eb83f8174d..1c1c70da29e 100644
--- a/src/util/is_char_in_unicode_block.js
+++ b/src/util/is_char_in_unicode_block.js
@@ -18,15 +18,15 @@ const unicodeBlockLookup: UnicodeBlockLookup = {
     // 'Cyrillic': (char) => char >= 0x0400 && char <= 0x04FF,
     // 'Cyrillic Supplement': (char) => char >= 0x0500 && char <= 0x052F,
     // 'Armenian': (char) => char >= 0x0530 && char <= 0x058F,
-    // 'Hebrew': (char) => char >= 0x0590 && char <= 0x05FF,
-    // 'Arabic': (char) => char >= 0x0600 && char <= 0x06FF,
-    // 'Syriac': (char) => char >= 0x0700 && char <= 0x074F,
-    // 'Arabic Supplement': (char) => char >= 0x0750 && char <= 0x077F,
+    //'Hebrew': (char) => char >= 0x0590 && char <= 0x05FF,
+    'Arabic': (char) => char >= 0x0600 && char <= 0x06FF,
+    //'Syriac': (char) => char >= 0x0700 && char <= 0x074F,
+    'Arabic Supplement': (char) => char >= 0x0750 && char <= 0x077F,
     // 'Thaana': (char) => char >= 0x0780 && char <= 0x07BF,
     // 'NKo': (char) => char >= 0x07C0 && char <= 0x07FF,
     // 'Samaritan': (char) => char >= 0x0800 && char <= 0x083F,
     // 'Mandaic': (char) => char >= 0x0840 && char <= 0x085F,
-    // 'Arabic Extended-A': (char) => char >= 0x08A0 && char <= 0x08FF,
+    'Arabic Extended-A': (char) => char >= 0x08A0 && char <= 0x08FF,
     // 'Devanagari': (char) => char >= 0x0900 && char <= 0x097F,
     // 'Bengali': (char) => char >= 0x0980 && char <= 0x09FF,
     // 'Gurmukhi': (char) => char >= 0x0A00 && char <= 0x0A7F,
@@ -159,13 +159,13 @@ const unicodeBlockLookup: UnicodeBlockLookup = {
     'Private Use Area': (char) => char >= 0xE000 && char <= 0xF8FF,
     'CJK Compatibility Ideographs': (char) => char >= 0xF900 && char <= 0xFAFF,
     // 'Alphabetic Presentation Forms': (char) => char >= 0xFB00 && char <= 0xFB4F,
-    // 'Arabic Presentation Forms-A': (char) => char >= 0xFB50 && char <= 0xFDFF,
+    'Arabic Presentation Forms-A': (char) => char >= 0xFB50 && char <= 0xFDFF,
     // 'Variation Selectors': (char) => char >= 0xFE00 && char <= 0xFE0F,
     'Vertical Forms': (char) => char >= 0xFE10 && char <= 0xFE1F,
     // 'Combining Half Marks': (char) => char >= 0xFE20 && char <= 0xFE2F,
     'CJK Compatibility Forms': (char) => char >= 0xFE30 && char <= 0xFE4F,
     'Small Form Variants': (char) => char >= 0xFE50 && char <= 0xFE6F,
-    // 'Arabic Presentation Forms-B': (char) => char >= 0xFE70 && char <= 0xFEFF,
+    'Arabic Presentation Forms-B': (char) => char >= 0xFE70 && char <= 0xFEFF,
     'Halfwidth and Fullwidth Forms': (char) => char >= 0xFF00 && char <= 0xFFEF
     // 'Specials': (char) => char >= 0xFFF0 && char <= 0xFFFF,
     // 'Linear B Syllabary': (char) => char >= 0x10000 && char <= 0x1007F,
diff --git a/src/util/script_detection.js b/src/util/script_detection.js
index ad8fb597cfe..89b9564a804 100644
--- a/src/util/script_detection.js
+++ b/src/util/script_detection.js
@@ -17,6 +17,23 @@ module.exports.allowsVerticalWritingMode = function(chars) {
     return false;
 };
 
+module.exports.allowsLetterSpacing = function(chars) {
+    for (const char of chars) {
+        if (!exports.charAllowsLetterSpacing(char.charCodeAt(0))) return false;
+    }
+    return true;
+};
+
+module.exports.charAllowsLetterSpacing = function(char) {
+    if (isChar['Arabic'](char)) return false;
+    if (isChar['Arabic Supplement'](char)) return false;
+    if (isChar['Arabic Extended-A'](char)) return false;
+    if (isChar['Arabic Presentation Forms-A'](char)) return false;
+    if (isChar['Arabic Presentation Forms-B'](char)) return false;
+
+    return true;
+};
+
 module.exports.charAllowsIdeographicBreaking = function(char) {
     // Return early for characters outside all ideographic ranges.
     if (char < 0x2E80) return false;
diff --git a/src/util/throttler.js b/src/util/throttler.js
new file mode 100644
index 00000000000..ab5120adb0f
--- /dev/null
+++ b/src/util/throttler.js
@@ -0,0 +1,55 @@
+'use strict';
+
+const browser = require('./browser');
+
+/**
+ * Throttles the provided function to run at most every
+ * 'frequency' milliseconds
+ *
+ * @interface Throttler
+ * @private
+ */
+class Throttler {
+
+    constructor(frequency, throttledFunction) {
+        this.frequency = frequency;
+        this.throttledFunction = throttledFunction;
+        this.lastInvocation = 0;
+    }
+
+    /**
+     * Request an invocation of the throttled function.
+     *
+     * @memberof Throttler
+     * @instance
+     */
+    invoke() {
+        if (this.pendingInvocation) {
+            return;
+        }
+
+        const timeToNextInvocation = this.lastInvocation === 0 ?
+            0 :
+            (this.lastInvocation + this.frequency) - browser.now();
+
+        if (timeToNextInvocation <= 0) {
+            this.lastInvocation = browser.now();
+            this.throttledFunction();
+        } else {
+            this.pendingInvocation = setTimeout(() => {
+                this.pendingInvocation = undefined;
+                this.lastInvocation = browser.now();
+                this.throttledFunction();
+            }, timeToNextInvocation);
+        }
+    }
+
+    stop() {
+        if (this.pendingInvocation) {
+            clearTimeout(this.pendingInvocation);
+            this.pendingInvocation = undefined;
+        }
+    }
+}
+
+module.exports = Throttler;
diff --git a/src/util/util.js b/src/util/util.js
index 54bf987487c..a52c1361289 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -139,13 +139,11 @@ exports.keysDifference = function (obj: {[key: string]: mixed}, other: {[key: st
  * source objects.
  *
  * @param dest destination object
- * @param {...Object} sources sources from which properties are pulled
+ * @param sources sources from which properties are pulled
  * @private
  */
-// eslint-disable-next-line no-unused-vars
-exports.extend = function (dest: Object, source0: Object, source1?: Object, source2?: Object): Object {
-    for (let i = 1; i < arguments.length; i++) {
-        const src = arguments[i];
+exports.extend = function (dest: Object, ...sources: Array<Object>): Object {
+    for (const src of sources) {
         for (const k in src) {
             dest[k] = src[k];
         }
diff --git a/test/integration/image/rocket.png b/test/integration/image/rocket.png
index 803c12830b7..36b68b19655 100644
Binary files a/test/integration/image/rocket.png and b/test/integration/image/rocket.png differ
diff --git a/test/integration/query-tests/edge-cases/box-cutting-antimeridian-z0/expected.json b/test/integration/query-tests/edge-cases/box-cutting-antimeridian-z0/expected.json
index 912955465e3..fcbe2f6360e 100644
--- a/test/integration/query-tests/edge-cases/box-cutting-antimeridian-z0/expected.json
+++ b/test/integration/query-tests/edge-cases/box-cutting-antimeridian-z0/expected.json
@@ -1,54 +1,54 @@
 [
-  {
-    "properties": {
-      "id": "B"
+    {
+        "properties": {
+            "id": "B"
+        },
+        "type": "Feature",
+        "geometry": {
+            "type": "Point",
+            "coordinates": [
+                90,
+                0
+            ]
+        }
     },
-    "type": "Feature",
-    "geometry": {
-      "type": "Point",
-      "coordinates": [
-        -270,
-        0
-      ]
-    }
-  },
-  {
-    "properties": {
-      "id": "C"
-    },
-    "type": "Feature",
-    "geometry": {
-      "type": "Point",
-      "coordinates": [
-        -90,
-        0
-      ]
-    }
-  },
-  {
-    "properties": {
-      "id": "B"
+    {
+        "properties": {
+            "id": "C"
+        },
+        "type": "Feature",
+        "geometry": {
+            "type": "Point",
+            "coordinates": [
+                270,
+                0
+            ]
+        }
     },
-    "type": "Feature",
-    "geometry": {
-      "type": "Point",
-      "coordinates": [
-        90,
-        0
-      ]
-    }
-  },
-  {
-    "properties": {
-      "id": "C"
+    {
+        "properties": {
+            "id": "B"
+        },
+        "type": "Feature",
+        "geometry": {
+            "type": "Point",
+            "coordinates": [
+                -270,
+                0
+            ]
+        }
     },
-    "type": "Feature",
-    "geometry": {
-      "type": "Point",
-      "coordinates": [
-        270,
-        0
-      ]
+    {
+        "properties": {
+            "id": "C"
+        },
+        "type": "Feature",
+        "geometry": {
+            "type": "Point",
+            "coordinates": [
+                -90,
+                0
+            ]
+        }
     }
-  }
-]
\ No newline at end of file
+]
diff --git a/test/integration/query-tests/results.html.tmpl b/test/integration/query-tests/results.html.tmpl
index 0ac1e923251..63c31a43677 100644
--- a/test/integration/query-tests/results.html.tmpl
+++ b/test/integration/query-tests/results.html.tmpl
@@ -11,7 +11,7 @@
 <tr>
     <td><img src="data:image/png;base64,<%- r.actual %>"></td>
     <td>
-        <h2 style="text-align:center; background:<%- r.color %>"><a href="<%- r.group %>/style.json"><%- r.group %>/<%- r.test %></a></h2>
+        <h2 style="text-align:center; background:<%- r.color %>"><a href="<%- r.group %>/style.json"><%- r.group %>/<%- r.test %> <% if (!r.ok) { %>(failed)<% } %></a></h2>
         <ul>
             <li>diff: <strong><%- r.difference %></strong></li>
             <li>zoom: <strong><%- r.zoom %></strong></li>
diff --git a/test/integration/render-tests/background-pattern/missing/expected.png b/test/integration/render-tests/background-pattern/missing/expected.png
new file mode 100644
index 00000000000..724d17cd7d3
Binary files /dev/null and b/test/integration/render-tests/background-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/background-pattern/missing/style.json b/test/integration/render-tests/background-pattern/missing/style.json
new file mode 100644
index 00000000000..a7e1d5a82ec
--- /dev/null
+++ b/test/integration/render-tests/background-pattern/missing/style.json
@@ -0,0 +1,20 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {},
+  "sprite": "local://sprites/emerald",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-pattern": "missing"
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/classes/additive/expected.png b/test/integration/render-tests/classes/additive/expected.png
deleted file mode 100644
index 2f34aeea6d8..00000000000
Binary files a/test/integration/render-tests/classes/additive/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/classes/additive/style.json b/test/integration/render-tests/classes/additive/style.json
deleted file mode 100644
index f7d9418e16e..00000000000
--- a/test/integration/render-tests/classes/additive/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "width": 64,
-      "height": 64,
-      "classes": [
-        "additive"
-      ],
-      "ignored": {
-        "js": "https://github.com/mapbox/mapbox-gl-js/pull/3643"
-      }
-    }
-  },
-  "center": [
-    0,
-    0
-  ],
-  "zoom": 0,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "red"
-      },
-      "paint.additive": {
-        "background-opacity": 0.5
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/classes/override/expected.png b/test/integration/render-tests/classes/override/expected.png
deleted file mode 100644
index 210be504d39..00000000000
Binary files a/test/integration/render-tests/classes/override/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/classes/override/style.json b/test/integration/render-tests/classes/override/style.json
deleted file mode 100644
index 98ea6f286a5..00000000000
--- a/test/integration/render-tests/classes/override/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "width": 64,
-      "height": 64,
-      "classes": [
-        "override"
-      ],
-      "ignored": {
-        "js": "https://github.com/mapbox/mapbox-gl-js/pull/3643"
-      }
-    }
-  },
-  "center": [
-    0,
-    0
-  ],
-  "zoom": 0,
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "red"
-      },
-      "paint.override": {
-        "background-color": "green"
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png b/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png
new file mode 100644
index 00000000000..c1ff274b1fe
Binary files /dev/null and b/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png differ
diff --git a/test/integration/render-tests/debug/collision-pitched-wrapped/style.json b/test/integration/render-tests/debug/collision-pitched-wrapped/style.json
new file mode 100644
index 00000000000..6515c0a22b2
--- /dev/null
+++ b/test/integration/render-tests/debug/collision-pitched-wrapped/style.json
@@ -0,0 +1,51 @@
+{
+    "version": 8,
+    "metadata": {
+        "test": {
+            "ignored": {
+              "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+             },
+            "collisionDebug": true,
+            "debug": true,
+            "width": 500,
+            "height": 500
+        }
+    },
+    "center": [
+        0,
+        0
+    ],
+    "zoom": 1,
+    "pitch": 60,
+    "bearing": 90,
+    "sources": {
+        "geojson": {
+            "type": "geojson",
+            "data": "local://data/places.geojson"
+        }
+    },
+    "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+    "sprite": "local://sprites/sprite",
+    "layers": [
+        {
+            "id": "background",
+            "type": "background",
+            "paint": {
+                "background-color": "white"
+            }
+        },
+        {
+            "id": "symbol",
+            "type": "symbol",
+            "source": "geojson",
+            "layout": {
+                "symbol-placement": "point",
+                "text-field": "test test test",
+                "text-font": [
+                  "Open Sans Semibold",
+                  "Arial Unicode MS Bold"
+                ]
+            }
+        }
+    ]
+}
diff --git a/test/integration/render-tests/debug/collision-pitched/expected.png b/test/integration/render-tests/debug/collision-pitched/expected.png
new file mode 100644
index 00000000000..c38a733eea1
Binary files /dev/null and b/test/integration/render-tests/debug/collision-pitched/expected.png differ
diff --git a/test/integration/render-tests/debug/collision-pitched/style.json b/test/integration/render-tests/debug/collision-pitched/style.json
new file mode 100644
index 00000000000..00cf43617fd
--- /dev/null
+++ b/test/integration/render-tests/debug/collision-pitched/style.json
@@ -0,0 +1,51 @@
+{
+    "version": 8,
+    "metadata": {
+        "test": {
+            "ignored": {
+              "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+             },
+            "collisionDebug": true,
+            "debug": true,
+            "width": 500,
+            "height": 500
+        }
+    },
+    "center": [
+        0,
+        0
+    ],
+    "zoom": 3,
+    "pitch": 60,
+    "bearing": 90,
+    "sources": {
+        "geojson": {
+            "type": "geojson",
+            "data": "local://data/places.geojson"
+        }
+    },
+    "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+    "sprite": "local://sprites/sprite",
+    "layers": [
+        {
+            "id": "background",
+            "type": "background",
+            "paint": {
+                "background-color": "white"
+            }
+        },
+        {
+            "id": "symbol",
+            "type": "symbol",
+            "source": "geojson",
+            "layout": {
+                "symbol-placement": "point",
+                "text-field": "test test test",
+                "text-font": [
+                  "Open Sans Semibold",
+                  "Arial Unicode MS Bold"
+                ]
+            }
+        }
+    ]
+}
diff --git a/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png b/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png
new file mode 100644
index 00000000000..2c804bd2eb1
Binary files /dev/null and b/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/fill-extrusion-pattern/missing/style.json b/test/integration/render-tests/fill-extrusion-pattern/missing/style.json
new file mode 100644
index 00000000000..adb17f0672b
--- /dev/null
+++ b/test/integration/render-tests/fill-extrusion-pattern/missing/style.json
@@ -0,0 +1,68 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "ignored": {
+        "js": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
+        "native": "https://github.com/mapbox/mapbox-gl-js/issues/3327"
+      }
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {
+              "property": 20
+            },
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [ [ -0.0004, 0 ],
+                  [ -0.0002, 0.0002 ],
+                  [ 0.0000, 0 ],
+                  [ -0.0002, -0.0002 ],
+                  [ -0.0004, 0 ] ]
+              ]
+            }
+          },
+          {
+            "type": "Feature",
+            "properties": {
+              "property": 20
+            },
+            "geometry": {
+              "type": "Polygon",
+              "coordinates": [
+                [ [ -0.0000, -0.0002 ],
+                  [ -0.0000, 0.0002 ],
+                  [ 0.0003, 0.0002 ],
+                  [ 0.0003, -0.0002 ],
+                  [ -0.0000, -0.0002 ] ]
+              ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "sprite": "local://sprites/emerald",
+  "pitch": 60,
+  "zoom": 18,
+  "layers": [
+    {
+      "id": "extrusion",
+      "type": "fill-extrusion",
+      "source": "geojson",
+      "paint": {
+        "fill-extrusion-pattern": "missing",
+        "fill-extrusion-height": 10
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/fill-pattern/missing/expected.png b/test/integration/render-tests/fill-pattern/missing/expected.png
new file mode 100644
index 00000000000..724d17cd7d3
Binary files /dev/null and b/test/integration/render-tests/fill-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/fill-pattern/missing/style.json b/test/integration/render-tests/fill-pattern/missing/style.json
new file mode 100644
index 00000000000..dee7bdb9570
--- /dev/null
+++ b/test/integration/render-tests/fill-pattern/missing/style.json
@@ -0,0 +1,53 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -10,
+              -10
+            ],
+            [
+              -10,
+              10
+            ],
+            [
+              10,
+              10
+            ],
+            [
+              10,
+              -10
+            ],
+            [
+              -10,
+              -10
+            ]
+          ]
+        ]
+      }
+    }
+  },
+  "sprite": "local://sprites/emerald",
+  "layers": [
+    {
+      "id": "fill",
+      "type": "fill",
+      "source": "geojson",
+      "paint": {
+        "fill-antialias": false,
+        "fill-pattern": "missing"
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png
new file mode 100644
index 00000000000..de8bdc7b3ee
Binary files /dev/null and b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json
new file mode 100644
index 00000000000..a6492c76726
--- /dev/null
+++ b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json
@@ -0,0 +1,56 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
+      "height": 512
+    }
+  },
+  "center": [
+    13.418056,
+    52.499167
+  ],
+  "zoom": 14,
+  "pitch": 30,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 14,
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.mvt"
+      ]
+    }
+  },
+  "sprite": "local://sprites/sprite",
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "icon",
+      "type": "symbol",
+      "source": "mapbox",
+      "source-layer": "poi_label",
+      "filter": [
+        "==",
+        "maki",
+        "restaurant"
+      ],
+      "layout": {
+        "symbol-placement": "point",
+        "icon-rotation-alignment": "map",
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-image": "building-12"
+      },
+      "paint": {}
+    }
+  ]
+}
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png
new file mode 100644
index 00000000000..ba821ba7188
Binary files /dev/null and b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json
new file mode 100644
index 00000000000..b26fc5d5f5d
--- /dev/null
+++ b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json
@@ -0,0 +1,55 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+       },
+      "height": 512
+    }
+  },
+  "center": [
+    13.418056,
+    52.499167
+  ],
+  "zoom": 14,
+  "pitch": 30,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 14,
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.mvt"
+      ]
+    }
+  },
+  "sprite": "local://sprites/sprite",
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "icon",
+      "type": "symbol",
+      "source": "mapbox",
+      "source-layer": "poi_label",
+      "filter": [
+        "==",
+        "maki",
+        "restaurant"
+      ],
+      "layout": {
+        "symbol-placement": "point",
+        "icon-allow-overlap": true,
+        "icon-ignore-placement": true,
+        "icon-image": "building-12"
+      },
+      "paint": {}
+    }
+  ]
+}
diff --git a/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json b/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
index e3de2b695a5..f918c923c17 100644
--- a/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
+++ b/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
@@ -2,9 +2,6 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/3164"
-      },
       "pixelRatio": 0.5,
       "height": 256
     }
@@ -53,4 +50,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/icon-text-fit/both-padding/expected.png b/test/integration/render-tests/icon-text-fit/both-padding/expected.png
index 8a34b0be422..158f08a289c 100644
Binary files a/test/integration/render-tests/icon-text-fit/both-padding/expected.png and b/test/integration/render-tests/icon-text-fit/both-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/both/expected.png b/test/integration/render-tests/icon-text-fit/both/expected.png
index 924f5a2fbe1..1ae5f1a5fd8 100644
Binary files a/test/integration/render-tests/icon-text-fit/both/expected.png and b/test/integration/render-tests/icon-text-fit/both/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/height-padding/expected.png b/test/integration/render-tests/icon-text-fit/height-padding/expected.png
index e1caf058d9c..da0fc133354 100644
Binary files a/test/integration/render-tests/icon-text-fit/height-padding/expected.png and b/test/integration/render-tests/icon-text-fit/height-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/height/expected.png b/test/integration/render-tests/icon-text-fit/height/expected.png
index 09f7a9f6b62..8e82a40ef8c 100644
Binary files a/test/integration/render-tests/icon-text-fit/height/expected.png and b/test/integration/render-tests/icon-text-fit/height/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/none/expected.png b/test/integration/render-tests/icon-text-fit/none/expected.png
index ff25d6e65df..6d20f71b3d6 100644
Binary files a/test/integration/render-tests/icon-text-fit/none/expected.png and b/test/integration/render-tests/icon-text-fit/none/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/placement-line/expected.png b/test/integration/render-tests/icon-text-fit/placement-line/expected.png
index 970898a2ab0..a26b210d05a 100644
Binary files a/test/integration/render-tests/icon-text-fit/placement-line/expected.png and b/test/integration/render-tests/icon-text-fit/placement-line/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/width-padding/expected.png b/test/integration/render-tests/icon-text-fit/width-padding/expected.png
index 9e44b50ef4b..4c24ccf3dde 100644
Binary files a/test/integration/render-tests/icon-text-fit/width-padding/expected.png and b/test/integration/render-tests/icon-text-fit/width-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/width/expected.png b/test/integration/render-tests/icon-text-fit/width/expected.png
index 9817ec2c77b..f872e4a61e0 100644
Binary files a/test/integration/render-tests/icon-text-fit/width/expected.png and b/test/integration/render-tests/icon-text-fit/width/expected.png differ
diff --git a/test/integration/render-tests/image/default/style.json b/test/integration/render-tests/image/default/style.json
index e66b8aa4dd5..f417e14ace6 100644
--- a/test/integration/render-tests/image/default/style.json
+++ b/test/integration/render-tests/image/default/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-brightness/style.json b/test/integration/render-tests/image/raster-brightness/style.json
index 3b690374a26..14c3f9065ef 100644
--- a/test/integration/render-tests/image/raster-brightness/style.json
+++ b/test/integration/render-tests/image/raster-brightness/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-contrast/style.json b/test/integration/render-tests/image/raster-contrast/style.json
index 5bea9675398..6d3df6a0a73 100644
--- a/test/integration/render-tests/image/raster-contrast/style.json
+++ b/test/integration/render-tests/image/raster-contrast/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-hue-rotate/style.json b/test/integration/render-tests/image/raster-hue-rotate/style.json
index 8b6ab96ae63..c8f53c4326b 100644
--- a/test/integration/render-tests/image/raster-hue-rotate/style.json
+++ b/test/integration/render-tests/image/raster-hue-rotate/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-opacity/style.json b/test/integration/render-tests/image/raster-opacity/style.json
index 8ad2820021e..09733fff75d 100644
--- a/test/integration/render-tests/image/raster-opacity/style.json
+++ b/test/integration/render-tests/image/raster-opacity/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-saturation/style.json b/test/integration/render-tests/image/raster-saturation/style.json
index 739330895ee..c5bd8da83a3 100644
--- a/test/integration/render-tests/image/raster-saturation/style.json
+++ b/test/integration/render-tests/image/raster-saturation/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/image/raster-visibility/style.json b/test/integration/render-tests/image/raster-visibility/style.json
index e66b8aa4dd5..f417e14ace6 100644
--- a/test/integration/render-tests/image/raster-visibility/style.json
+++ b/test/integration/render-tests/image/raster-visibility/style.json
@@ -2,14 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
-      },
       "width": 512,
-      "height": 512,
-      "skipped": {
-        "native": "needs issue"
-      }
+      "height": 512
     }
   },
   "center": [
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png
deleted file mode 100644
index 239ba6376ed..00000000000
Binary files a/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json
deleted file mode 100644
index 306bac68662..00000000000
--- a/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "version": 8,
-  "metadata": {
-    "test": {
-      "operations": [
-        ["addClass", "mapbox", {"transition": false}],
-        ["setPaintProperty", "land", "fill-pattern", "zoo_icon"],
-        ["wait"]
-      ]
-    }
-  },
-  "sources": {
-    "mapbox": {
-      "type": "vector",
-      "maxzoom": 14,
-      "tiles": [
-        "local://tiles/{z}-{x}-{y}.mvt"
-      ]
-    }
-  },
-  "sprite": "local://sprites/emerald",
-  "layers": [
-    {
-      "id": "background",
-      "type": "background",
-      "paint": {
-        "background-color": "white"
-      }
-    },
-    {
-      "id": "land",
-      "type": "fill",
-      "source": "mapbox",
-      "source-layer": "water",
-      "paint": {
-        "fill-color": "#3bb2d0",
-        "fill-pattern": "monument_icon"
-      }
-    }
-  ]
-}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png
new file mode 100644
index 00000000000..5bbd8ae7f2d
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json
new file mode 100644
index 00000000000..05fabae841e
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json
@@ -0,0 +1,45 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 64,
+      "width": 64,
+      "collisionDebug":true
+    }
+  },
+  "center": [ 0, 0 ],
+  "zoom": 0,
+  "sources": {
+    "point": {
+      "type": "geojson",
+      "data": {
+        "type": "FeatureCollection",
+        "features": [
+          {
+            "type": "Feature",
+            "properties": {},
+            "geometry": {
+              "type": "Point",
+              "coordinates": [ 0, 0 ]
+            }
+          }
+        ]
+      }
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "text",
+      "type": "symbol",
+      "source": "point",
+      "layout": {
+        "text-field": "Test",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ]
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png b/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png
new file mode 100644
index 00000000000..fad1d9103b1
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json b/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json
new file mode 100644
index 00000000000..a0e7ed2facc
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json
@@ -0,0 +1,52 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "operations": [
+        [
+          "wait"
+        ],
+        [
+          "addLayer",
+          {
+            "id": "circle2",
+            "type": "circle",
+            "source": "geojson",
+            "paint": {
+              "circle-color": "red",
+              "circle-radius": 5
+            }
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [
+          0,
+          0
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "circle",
+      "type": "circle",
+      "source": "geojson",
+      "paint": {
+        "circle-color": "blue",
+        "circle-radius": 10
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png b/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png
new file mode 100644
index 00000000000..d58554e96e6
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json b/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json
new file mode 100644
index 00000000000..f02d55b9c58
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json
@@ -0,0 +1,36 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "operations": [
+        [
+          "wait"
+        ],
+        [
+          "setZoom",
+          1
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {},
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": {
+          "stops": [
+            [0, "white"],
+            [1, "black"]
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/test/integration/render-tests/results.html.tmpl b/test/integration/render-tests/results.html.tmpl
index 46a10b479e3..ef48f88018c 100644
--- a/test/integration/render-tests/results.html.tmpl
+++ b/test/integration/render-tests/results.html.tmpl
@@ -29,7 +29,7 @@
     <td><img style="width: <%- r.width %>; height: <%- r.height %>" src="data:image/png;base64,<%- r.actual %>" data-alt-src="data:image/png;base64,<%- r.expected %>"></td>
     <td><img style="width: <%- r.width %>; height: <%- r.height %>" src="data:image/png;base64,<%- r.diff %>"></td>
     <td>
-        <h2 style="background: <%- r.color %>"><a href="<%- r.group %>/<%- r.test %>/style.json"><%- r.group %>/<%- r.test %></a></h2>
+        <h2 style="background: <%- r.color %>"><a href="<%- r.group %>/<%- r.test %>/style.json"><%- r.group %>/<%- r.test %> <% if (!r.ok) { %>(failed)<% } %></a></h2>
         <ul>
             <li>diff: <strong><%- r.difference %></strong></li>
             <% if (r.zoom) { %><li>zoom: <strong><%- r.zoom %></strong></li><% } %>
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png
new file mode 100644
index 00000000000..d1074ed8bbd
Binary files /dev/null and b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json
new file mode 100644
index 00000000000..2d063abc471
--- /dev/null
+++ b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json
@@ -0,0 +1,42 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "pixelRatio": 1,
+      "operations": [
+        [
+          "addImage",
+          "marker",
+          "./sprites/1.5x.png",
+          1.5
+        ],
+        [
+          "addLayer",
+          {
+            "id": "geometry",
+            "type": "symbol",
+            "source": "geometry",
+            "layout": {
+              "icon-image": "marker"
+            }
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geometry": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [0, 0]
+      }
+    }
+  },
+  "layers": []
+}
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png
new file mode 100644
index 00000000000..f6bedeaac50
Binary files /dev/null and b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json
new file mode 100644
index 00000000000..5b974e9c878
--- /dev/null
+++ b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json
@@ -0,0 +1,42 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 64,
+      "pixelRatio": 2,
+      "operations": [
+        [
+          "addImage",
+          "marker",
+          "./sprites/1.5x.png",
+          1.5
+        ],
+        [
+          "addLayer",
+          {
+            "id": "geometry",
+            "type": "symbol",
+            "source": "geometry",
+            "layout": {
+              "icon-image": "marker"
+            }
+          }
+        ],
+        [
+          "wait"
+        ]
+      ]
+    }
+  },
+  "sources": {
+    "geometry": {
+      "type": "geojson",
+      "data": {
+        "type": "Point",
+        "coordinates": [0, 0]
+      }
+    }
+  },
+  "layers": []
+}
diff --git a/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png
index 309f787dcc1..2f9d0663ec3 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png
index 07895f2b64a..44770e5ecdf 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
index c5cc5d20d55..472f3f52bd6 100644
--- a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
@@ -2,9 +2,6 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
-      },
       "width": 64,
       "height": 64,
       "pixelRatio": 1,
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png
index efe3e87dd4e..e7135300c68 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
index 0630063d1a7..8c84fa532bb 100644
--- a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
@@ -2,9 +2,6 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
-      },
       "width": 64,
       "height": 64,
       "pixelRatio" :2,
diff --git a/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png b/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png
index 960fec0b6be..c6037245576 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png and b/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-alpha/style.json b/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
index 2f7a478b5da..36368dec715 100644
--- a/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
@@ -2,9 +2,6 @@
   "version": 8,
   "metadata": {
     "test": {
-      "ignored": {
-        "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
-      },
       "width": 64,
       "height": 64,
       "operations": [
diff --git a/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png b/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png
index 3be50e4ff30..44770e5ecdf 100644
Binary files a/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png and b/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png differ
diff --git a/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png b/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png
index 0d8ff67c8ce..2f9d0663ec3 100644
Binary files a/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png and b/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png differ
diff --git a/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png b/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png
index d0455e1c98b..e7135300c68 100644
Binary files a/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png and b/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png differ
diff --git a/test/integration/render-tests/text-arabic/letter-spacing/expected.png b/test/integration/render-tests/text-arabic/letter-spacing/expected.png
new file mode 100644
index 00000000000..212659e51bf
Binary files /dev/null and b/test/integration/render-tests/text-arabic/letter-spacing/expected.png differ
diff --git a/test/integration/render-tests/text-arabic/letter-spacing/style.json b/test/integration/render-tests/text-arabic/letter-spacing/style.json
new file mode 100644
index 00000000000..fb56e6df843
--- /dev/null
+++ b/test/integration/render-tests/text-arabic/letter-spacing/style.json
@@ -0,0 +1,56 @@
+{
+    "version": 8,
+    "metadata": {
+        "test": {
+            "width": 256,
+            "height": 256
+        }
+    },
+    "sources": {
+        "geojson": {
+            "type": "geojson",
+            "data": {
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": { "name": "مجتمع آپارتمانهای مرتفع Not spaced" },
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [ 0, 0 ]
+                        }
+                    },
+                    {
+                        "type": "Feature",
+                        "properties": { "name": "Spaced" },
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [ 0, 30 ]
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+    "layers": [
+        {
+            "id": "symbol",
+            "type": "symbol",
+            "source": "geojson",
+            "layout": {
+                "symbol-placement": "point",
+                "symbol-spacing": 20,
+                "text-allow-overlap": true,
+                "text-letter-spacing": 1,
+                "text-rotation-alignment": "auto",
+                "text-max-width": 5,
+                "text-field": "{name}",
+                "text-font": [
+                    "Open Sans Semibold",
+                    "Arial Unicode MS Bold"
+                ]
+            }
+        }
+    ]
+}
diff --git a/test/integration/render-tests/text-halo-blur/default/expected.png b/test/integration/render-tests/text-halo-blur/default/expected.png
index 2e73264f090..8c8d95e08ff 100644
Binary files a/test/integration/render-tests/text-halo-blur/default/expected.png and b/test/integration/render-tests/text-halo-blur/default/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/function/expected.png b/test/integration/render-tests/text-halo-blur/function/expected.png
index 4eb47807f8c..713cdf3eed1 100644
Binary files a/test/integration/render-tests/text-halo-blur/function/expected.png and b/test/integration/render-tests/text-halo-blur/function/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/literal/expected.png b/test/integration/render-tests/text-halo-blur/literal/expected.png
index 1f1feddc8b0..f0a62e10308 100644
Binary files a/test/integration/render-tests/text-halo-blur/literal/expected.png and b/test/integration/render-tests/text-halo-blur/literal/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/property-function/expected.png b/test/integration/render-tests/text-halo-blur/property-function/expected.png
index 2d640e411ee..e21d2ae4e43 100644
Binary files a/test/integration/render-tests/text-halo-blur/property-function/expected.png and b/test/integration/render-tests/text-halo-blur/property-function/expected.png differ
diff --git a/test/integration/render-tests/text-halo-width/function/expected.png b/test/integration/render-tests/text-halo-width/function/expected.png
index d4affc12710..4e4a218f7e6 100644
Binary files a/test/integration/render-tests/text-halo-width/function/expected.png and b/test/integration/render-tests/text-halo-width/function/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png
index 1c9aa911b32..01f7a0f698d 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
index ba2f96cf3a7..68a32e6ff2b 100644
--- a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+       },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png
index 889ad937366..948d22f692a 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
index 7ae7fd2bb6b..1bb5dfbcab3 100644
--- a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+          "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png
index ab2f60fd95c..34fc7bd0e05 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
index 97e1b39d462..ca43c7ba9db 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "height": 256,
       "diff": 0.00025
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png
index 1c9aa911b32..01f7a0f698d 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
index d39e03385c0..1b99785ea30 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png
index cf227a43931..2d7031ca9a1 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
index 6d5bcacf327..02dae2b58a8 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png
index ba0f95502f5..992481538a7 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
index 5532c4b142e..997e064acf3 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "height": 256,
       "diff": 0.00025
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png
index ad0e97600e3..8d2024a709e 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
index a4e1cf964b6..f36be4d83a6 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png
index 889ad937366..948d22f692a 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
index 89c221b5882..057cb2a4a6a 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
   "version": 8,
   "metadata": {
     "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },
       "allowed": 0.005,
       "height": 256
     }
diff --git a/test/integration/render-tests/text-pitch-scaling/line-half/expected.png b/test/integration/render-tests/text-pitch-scaling/line-half/expected.png
new file mode 100644
index 00000000000..b4ea1a351df
Binary files /dev/null and b/test/integration/render-tests/text-pitch-scaling/line-half/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-scaling/line-half/style.json b/test/integration/render-tests/text-pitch-scaling/line-half/style.json
new file mode 100644
index 00000000000..8d1bc066a8b
--- /dev/null
+++ b/test/integration/render-tests/text-pitch-scaling/line-half/style.json
@@ -0,0 +1,67 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "ignored": {
+        "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+      },   
+      "allowed": 0.005,
+      "height": 512
+    }
+  },
+  "center": [
+    13.418056,
+    52.499167
+  ],
+  "zoom": 16,
+  "pitch": 30,
+  "sources": {
+    "mapbox": {
+      "type": "vector",
+      "maxzoom": 14,
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.mvt"
+      ]
+    }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "road",
+      "type": "line",
+      "source": "mapbox",
+      "source-layer": "road",
+      "paint": {
+          "line-color": "#888",
+          "line-width": 1
+      }
+    },
+    {
+      "id": "text",
+      "type": "symbol",
+      "source": "mapbox",
+      "source-layer": "road_label",
+      "layout": {
+        "symbol-placement": "line",
+        "symbol-spacing": 60,
+        "text-rotation-alignment": "map",
+        "text-pitch-alignment": "auto",
+        "text-field": "{class}",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ]
+      },
+      "paint": {
+        "text-opacity": 1
+      }
+    }
+  ]
+}
diff --git a/test/integration/sprites/1.5x.png b/test/integration/sprites/1.5x.png
new file mode 100644
index 00000000000..75607750d6c
Binary files /dev/null and b/test/integration/sprites/1.5x.png differ
diff --git a/test/node_modules/mapbox-gl-js-test.js b/test/node_modules/mapbox-gl-js-test.js
index d103aae6c4e..8ccc030257a 100644
--- a/test/node_modules/mapbox-gl-js-test.js
+++ b/test/node_modules/mapbox-gl-js-test.js
@@ -9,7 +9,7 @@ tap.Test.prototype.addAssert('equalWithPrecision', 3, assertEqualWithPrecision);
 function assertEqualWithPrecision(expected, actual, multiplier, message, extra) {
     message = message || `should be equal to within ${multiplier}`;
     const expectedRounded = Math.round(expected / multiplier) * multiplier;
-    const actualRounded = Math.round(expected / multiplier) * multiplier;
+    const actualRounded = Math.round(actual / multiplier) * multiplier;
 
     return this.equal(expectedRounded, actualRounded, message, extra);
 }
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index f5353e8d294..7675c8a6776 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -43,12 +43,15 @@ module.exports = function(style, options, _callback) {
     map.repaint = true;
 
     if (options.debug) map.showTileBoundaries = true;
-    if (options.collisionDebug) map.showCollisionBoxes = true;
     if (options.showOverdrawInspector) map.showOverdrawInspector = true;
 
     const gl = map.painter.gl;
 
     map.once('load', () => {
+        if (options.collisionDebug) {
+            map.showCollisionBoxes = true;
+            options.operations = [["wait"]];
+        }
         applyOperations(map, options.operations, () => {
             const w = options.width * window.devicePixelRatio;
             const h = options.height * window.devicePixelRatio;
diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js
index bd8a29ebacb..a9b2366df00 100644
--- a/test/unit/data/symbol_bucket.test.js
+++ b/test/unit/data/symbol_bucket.test.js
@@ -6,7 +6,7 @@ const path = require('path');
 const Protobuf = require('pbf');
 const VectorTile = require('vector-tile').VectorTile;
 const SymbolBucket = require('../../../src/data/bucket/symbol_bucket');
-const Collision = require('../../../src/symbol/collision_tile');
+const CollisionTile = require('../../../src/symbol/collision_tile');
 const CollisionBoxArray = require('../../../src/symbol/collision_box');
 const GlyphAtlas = require('../../../src/symbol/glyph_atlas');
 const StyleLayer = require('../../../src/style/style_layer');
@@ -21,7 +21,7 @@ const glyphs = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../fixtures/
 
 /*eslint new-cap: 0*/
 const collisionBoxArray = new CollisionBoxArray();
-const collision = new Collision(0, 0, collisionBoxArray);
+const collision = new CollisionTile(0, 0, 1, 1, collisionBoxArray);
 const atlas = new GlyphAtlas();
 for (const id in glyphs) {
     glyphs[id].bitmap = true;
@@ -131,7 +131,7 @@ test('SymbolBucket#getPaintPropertyStatistics()', (t) => {
 
     bucket.populate([feature], options);
     bucket.prepare(stacks, {
-        dot: { width: 10, height: 10, pixelRatio: 1, rect: { w: 10, h: 10 } }
+        dot: { displaySize: () => [10, 10], textureRect: { x: 0, y: 0, w: 10, h: 10 }, pixelRatio: 1 }
     });
     bucket.place(collision);
 
diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js
index 6ad5fa3fd6f..1721ed5e4ce 100644
--- a/test/unit/source/geojson_source.test.js
+++ b/test/unit/source/geojson_source.test.js
@@ -185,7 +185,7 @@ test('GeoJSONSource#update', (t) => {
 
         const source = new GeoJSONSource('id', {data: {}}, mockDispatcher);
         source.map = {
-            transform: {}
+            transform: { cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; } }
         };
 
         source.on('data', (e) => {
diff --git a/test/unit/source/source_cache.test.js b/test/unit/source/source_cache.test.js
index 5214a818d00..65d56818997 100644
--- a/test/unit/source/source_cache.test.js
+++ b/test/unit/source/source_cache.test.js
@@ -166,7 +166,7 @@ test('SourceCache#addTile', (t) => {
         t.end();
     });
 
-    t.test('reuses wrapped tile', (t) => {
+    t.test('does not reuse wrapped tile', (t) => {
         const coord = new TileCoord(0, 0, 0);
         let load = 0,
             add = 0;
@@ -183,9 +183,9 @@ test('SourceCache#addTile', (t) => {
         const t1 = sourceCache.addTile(coord);
         const t2 = sourceCache.addTile(new TileCoord(0, 0, 0, 1));
 
-        t.equal(load, 1);
-        t.equal(add, 1);
-        t.equal(t1, t2);
+        t.equal(load, 2);
+        t.equal(add, 2);
+        t.notEqual(t1, t2);
 
         t.end();
     });
@@ -478,7 +478,7 @@ test('SourceCache#update', (t) => {
 
         const sourceCache = createSourceCache({
             loadTile: function(tile, callback) {
-                tile.state = (tile.coord.id === new TileCoord(0, 0, 0).id) ? 'loaded' : 'loading';
+                tile.state = (tile.coord.id === new TileCoord(0, 0, 0, 1).id) ? 'loaded' : 'loading';
                 callback();
             }
         });
diff --git a/test/unit/source/tile.test.js b/test/unit/source/tile.test.js
index ab336300a99..8c94e539b86 100644
--- a/test/unit/source/tile.test.js
+++ b/test/unit/source/tile.test.js
@@ -142,7 +142,7 @@ test('Tile#redoPlacement', (t) => {
                 send: () => {}
             },
             map: {
-                transform: {}
+                transform: { cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; } }
             }
         };
 
@@ -249,7 +249,7 @@ function createVectorData(options) {
     const collisionBoxArray = new CollisionBoxArray();
     return util.extend({
         collisionBoxArray: collisionBoxArray.serialize(),
-        collisionTile: (new CollisionTile(0, 0, collisionBoxArray)).serialize(),
+        collisionTile: (new CollisionTile(0, 0, 1, 1, collisionBoxArray)).serialize(),
         featureIndex: (new FeatureIndex(new TileCoord(1, 1, 1))).serialize(),
         buckets: []
     }, options);
diff --git a/test/unit/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js
index c03a752141c..3cb8cc23645 100644
--- a/test/unit/source/vector_tile_source.test.js
+++ b/test/unit/source/vector_tile_source.test.js
@@ -9,7 +9,7 @@ const Evented = require('../../../src/util/evented');
 function createSource(options) {
     const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent);
     source.onAdd({
-        transform: { angle: 0, pitch: 0, showCollisionBoxes: false }
+        transform: { angle: 0, pitch: 0, cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; }, showCollisionBoxes: false }
     });
 
     source.on('error', (e) => {
diff --git a/test/unit/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js
index 954c681de48..fcbfd5f0462 100644
--- a/test/unit/source/vector_tile_worker_source.test.js
+++ b/test/unit/source/vector_tile_worker_source.test.js
@@ -53,7 +53,7 @@ test('redoPlacement', (t) => {
     t.test('on loaded tile', (t) => {
         const source = new VectorTileWorkerSource(null, new StyleLayerIndex());
         const tile = {
-            redoPlacement: function(angle, pitch, showCollisionBoxes) {
+            redoPlacement: function(angle, pitch, cameraToCenterDistance, cameraToTileDistance, showCollisionBoxes) {
                 t.equal(angle, 60);
                 t.equal(pitch, 30);
                 t.equal(showCollisionBoxes, false);
@@ -70,6 +70,8 @@ test('redoPlacement', (t) => {
             source: 'mapbox',
             angle: 60,
             pitch: 30,
+            cameraToCenterDistance: 1,
+            cameraToTileDistance: 1,
             showCollisionBoxes: false
         }, (err, result, transferables) => {
             t.error(err);
diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js
index 0e1dd6ce1ed..ed2efdd84ab 100644
--- a/test/unit/style/style.test.js
+++ b/test/unit/style/style.test.js
@@ -816,8 +816,8 @@ test('Style#addLayer', (t) => {
         };
 
         style.on('style.load', () => {
-            style.on('error', (e) => {
-                t.match(e.error.message, /does not exist on source/);
+            style.on('error', ({ error }) => {
+                t.match(error.message, /does not exist on source/);
                 t.end();
             });
             style.addLayer(layer);
@@ -882,8 +882,8 @@ test('Style#removeLayer', (t) => {
         const style = new Style(createStyleJSON());
 
         style.on('style.load', () => {
-            style.on('error', (e) => {
-                t.match(e.error.message, /does not exist in the map\'s style and cannot be removed/);
+            style.on('error', ({ error }) => {
+                t.match(error.message, /does not exist in the map\'s style and cannot be removed/);
                 t.end();
             });
             style.removeLayer('background');
@@ -961,8 +961,8 @@ test('Style#moveLayer', (t) => {
         const style = new Style(createStyleJSON());
 
         style.on('style.load', () => {
-            style.on('error', (e) => {
-                t.match(e.error.message, /does not exist in the map\'s style and cannot be moved/);
+            style.on('error', ({ error }) => {
+                t.match(error.message, /does not exist in the map\'s style and cannot be moved/);
                 t.end();
             });
             style.moveLayer('background');
@@ -1080,8 +1080,8 @@ test('Style#setFilter', (t) => {
         const style = createStyle();
 
         style.on('style.load', () => {
-            style.on('error', (e) => {
-                t.match(e.error.message, /does not exist in the map\'s style and cannot be filtered/);
+            style.on('error', ({ error }) => {
+                t.match(error.message, /does not exist in the map\'s style and cannot be filtered/);
                 t.end();
             });
             style.setFilter('non-existant', ['==', 'id', 1]);
@@ -1135,8 +1135,8 @@ test('Style#setLayerZoomRange', (t) => {
     t.test('fires an error if layer not found', (t) => {
         const style = createStyle();
         style.on('style.load', () => {
-            style.on('error', (e) => {
-                t.match(e.error.message, /does not exist in the map\'s style and cannot have zoom extent/);
+            style.on('error', ({ error }) => {
+                t.match(error.message, /does not exist in the map\'s style and cannot have zoom extent/);
                 t.end();
             });
             style.setLayerZoomRange('non-existant', 5, 12);
diff --git a/test/unit/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js
index d3e02683b74..7f330d32d33 100644
--- a/test/unit/symbol/collision_feature.js
+++ b/test/unit/symbol/collision_feature.js
@@ -38,6 +38,8 @@ test('CollisionFeature', (t) => {
         const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
         const boxPoints = pluckAnchorPoints(cf);
         t.deepEqual(boxPoints, [
+            { x: 448, y: 90},
+            { x: 458, y: 92},
             { x: 468, y: 94},
             { x: 478, y: 96},
             { x: 487, y: 97},
@@ -47,7 +49,32 @@ test('CollisionFeature', (t) => {
             { x: 522, y: 84},
             { x: 531, y: 80},
             { x: 540, y: 76},
-            { x: 549, y: 72} ]);
+            { x: 549, y: 72},
+            { x: 558, y: 67},
+            { x: 567, y: 63} ]);
+        t.end();
+    });
+
+    test('boxes for handling pitch underzooming have scale < 1', (t) => {
+        const line = [new Point(0, 0), new Point(500, 100), new Point(510, 90), new Point(700, 0)];
+        const anchor = new Anchor(505, 95, 0, 1);
+        const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
+        const maxScales = pluckMaxScales(cf);
+        t.deepEqual(maxScales, [
+            0.9090909361839294,
+            0.9900000095367432,
+            1.4285714626312256,
+            2,
+            3.3333332538604736,
+            10,
+            Infinity,
+            10,
+            3.3333332538604736,
+            2,
+            1.4285714626312256,
+            1.1111111640930176,
+            0.9090909361839294,
+            0.7692307829856873]);
         t.end();
     });
 
@@ -57,6 +84,8 @@ test('CollisionFeature', (t) => {
         const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
         const boxPoints = pluckAnchorPoints(cf);
         t.deepEqual(boxPoints, [
+            { x: 0, y: 50 },
+            { x: 0, y: 60 },
             { x: 0, y: 70 },
             { x: 0, y: 80 },
             { x: 0, y: 90 },
@@ -66,7 +95,9 @@ test('CollisionFeature', (t) => {
             { x: 0, y: 130 },
             { x: 0, y: 140 },
             { x: 0, y: 150 },
-            { x: 0, y: 160 } ]);
+            { x: 0, y: 160 },
+            { x: 0, y: 170 },
+            { x: 0, y: 180 } ]);
         t.end();
     });
 
@@ -111,7 +142,7 @@ test('CollisionFeature', (t) => {
         const line = [new Point(0, 0), new Point(500, 100), new Point(510, 90), new Point(700, 0)];
         const anchor = new Anchor(505, 95, 0, 1);
         const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
-        t.ok(cf.boxEndIndex - cf.boxStartIndex < 30);
+        t.ok(cf.boxEndIndex - cf.boxStartIndex < 45);
         t.end();
     });
 
@@ -133,4 +164,12 @@ test('CollisionFeature', (t) => {
         }
         return result;
     }
+
+    function pluckMaxScales(cf) {
+        const result = [];
+        for (let i = cf.boxStartIndex; i < cf.boxEndIndex; i++) {
+            result.push(collisionBoxArray.get(i).maxScale);
+        }
+        return result;
+    }
 });
diff --git a/test/unit/symbol/quads.test.js b/test/unit/symbol/quads.test.js
index a4e158bcbb4..5f43884af65 100644
--- a/test/unit/symbol/quads.test.js
+++ b/test/unit/symbol/quads.test.js
@@ -23,7 +23,7 @@ function createShapedIcon() {
         right: 8,
         image: {
             pixelRatio: 1,
-            rect: { w: 15, h: 11}
+            textureRect: { x: 1, y: 1, w: 15, h: 11}
         }
     };
 }
@@ -39,10 +39,10 @@ test('getIconQuads', (t) => {
             {
                 anchorPoint: { x: 2, y: 3 },
                 tl: { x: -8, y: -6 },
-                tr: { x: 7, y: -6 },
-                bl: { x: -8, y: 5 },
-                br: { x: 7, y: 5 },
-                tex: { w: 15, h: 11 },
+                tr: { x: 9, y: -6 },
+                bl: { x: -8, y: 7 },
+                br: { x: 9, y: 7 },
+                tex: {  x: 0, y: 0, w: 17, h: 13 },
                 anchorAngle: 0,
                 glyphAngle: 0,
                 minScale: 0.5,
@@ -61,10 +61,10 @@ test('getIconQuads', (t) => {
             {
                 anchorPoint: { x: 2, y: 3},
                 tl: { x: -8, y: -6 },
-                tr: { x: 7, y: -6 },
-                bl: { x: -8, y: 5 },
-                br: { x: 7, y: 5 },
-                tex: { w: 15, h: 11 },
+                tr: { x: 9, y: -6 },
+                bl: { x: -8, y: 7 },
+                br: { x: 9, y: 7 },
+                tex: { x: 0, y: 0, w: 17, h: 13 },
                 anchorAngle: 0,
                 glyphAngle: 0,
                 minScale: 0.5,
@@ -86,7 +86,7 @@ test('getIconQuads text-fit', (t) => {
             right: 10,
             image: {
                 pixelRatio: 1,
-                rect: { w: 20, h: 20 }
+                textureRect: {  x: 1, y: 1, w: 20, h: 20 }
             }
         };
     }
@@ -107,9 +107,9 @@ test('getIconQuads text-fit', (t) => {
             }
         }), false, createshapedText());
         t.deepEqual(quads[0].tl, { x: -11, y: -11 });
-        t.deepEqual(quads[0].tr, { x: 9, y: -11 });
-        t.deepEqual(quads[0].bl, { x: -11, y: 9 });
-        t.deepEqual(quads[0].br, { x: 9, y: 9 });
+        t.deepEqual(quads[0].tr, { x: 11, y: -11 });
+        t.deepEqual(quads[0].bl, { x: -11, y: 11 });
+        t.deepEqual(quads[0].br, { x: 11, y: 11 });
 
         t.deepEqual(quads, getIconQuads(anchor, createShapedIcon(), 2, [], createLayer({
             layout: {
@@ -131,10 +131,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 0, 0, 0, 0 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -60, y: 0 });
-        t.deepEqual(quads[0].tr, { x: 20, y: 0 });
-        t.deepEqual(quads[0].bl, { x: -60, y: 20 });
-        t.deepEqual(quads[0].br, { x: 20, y: 20 });
+        t.deepEqual(quads[0].tl, { x: -60, y: -1 });
+        t.deepEqual(quads[0].tr, { x: 20, y: -1 });
+        t.deepEqual(quads[0].bl, { x: -60, y: 21 });
+        t.deepEqual(quads[0].br, { x: 20, y: 21 });
         t.end();
     });
 
@@ -148,10 +148,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 0, 0, 0, 0 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -30, y: -5 });
-        t.deepEqual(quads[0].tr, { x: 10, y: -5 });
-        t.deepEqual(quads[0].bl, { x: -30, y: 15 });
-        t.deepEqual(quads[0].br, { x: 10, y: 15 });
+        t.deepEqual(quads[0].tl, { x: -30, y: -6 });
+        t.deepEqual(quads[0].tr, { x: 10, y: -6 });
+        t.deepEqual(quads[0].bl, { x: -30, y: 16 });
+        t.deepEqual(quads[0].br, { x: 10, y: 16 });
         t.end();
     });
 
@@ -166,10 +166,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 5, 10, 5, 10 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -40, y: -10 });
-        t.deepEqual(quads[0].tr, { x: 20, y: -10 });
-        t.deepEqual(quads[0].bl, { x: -40, y: 20 });
-        t.deepEqual(quads[0].br, { x: 20, y: 20 });
+        t.deepEqual(quads[0].tl, { x: -40, y: -11 });
+        t.deepEqual(quads[0].tr, { x: 20, y: -11 });
+        t.deepEqual(quads[0].bl, { x: -40, y: 21 });
+        t.deepEqual(quads[0].br, { x: 20, y: 21 });
         t.end();
     });
 
@@ -183,10 +183,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 0, 0, 0, 0 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -30, y: -10 });
-        t.deepEqual(quads[0].tr, { x: -10, y: -10 });
-        t.deepEqual(quads[0].bl, { x: -30, y: 30 });
-        t.deepEqual(quads[0].br, { x: -10, y: 30 });
+        t.deepEqual(quads[0].tl, { x: -31, y: -10 });
+        t.deepEqual(quads[0].tr, { x: -9, y: -10 });
+        t.deepEqual(quads[0].bl, { x: -31, y: 30 });
+        t.deepEqual(quads[0].br, { x: -9, y: 30 });
         t.end();
     });
 
@@ -200,10 +200,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 0, 0, 0, 0 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -20, y: -5 });
-        t.deepEqual(quads[0].tr, { x: 0, y: -5 });
-        t.deepEqual(quads[0].bl, { x: -20, y: 15 });
-        t.deepEqual(quads[0].br, { x: 0, y: 15 });
+        t.deepEqual(quads[0].tl, { x: -21, y: -5 });
+        t.deepEqual(quads[0].tr, { x: 1, y: -5 });
+        t.deepEqual(quads[0].bl, { x: -21, y: 15 });
+        t.deepEqual(quads[0].br, { x: 1, y: 15 });
         t.end();
     });
 
@@ -218,10 +218,10 @@ test('getIconQuads text-fit', (t) => {
                 'icon-text-fit-padding': [ 5, 10, 5, 10 ]
             }
         }), false, createshapedText());
-        t.deepEqual(quads[0].tl, { x: -30, y: -10 });
-        t.deepEqual(quads[0].tr, { x: 10, y: -10 });
-        t.deepEqual(quads[0].bl, { x: -30, y: 20 });
-        t.deepEqual(quads[0].br, { x: 10, y: 20 });
+        t.deepEqual(quads[0].tl, { x: -31, y: -10 });
+        t.deepEqual(quads[0].tr, { x: 11, y: -10 });
+        t.deepEqual(quads[0].bl, { x: -31, y: 20 });
+        t.deepEqual(quads[0].br, { x: 11, y: 20 });
         t.end();
     });
 
diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js
index 9ba4da7e3e4..ec655ff378d 100644
--- a/test/unit/ui/camera.test.js
+++ b/test/unit/ui/camera.test.js
@@ -784,6 +784,13 @@ test('camera', (t) => {
             t.end();
         });
 
+        t.test('does not throw when cameras current zoom is sufficiently greater than passed zoom option', (t)=>{
+            const camera = createCamera({zoom: 22, center:[0, 0]});
+            t.doesNotThrow(()=>camera.flyTo({zoom:10, center:[0, 0]}));
+            t.end();
+
+        });
+
         t.test('zooms to specified level', (t) => {
             const camera = createCamera();
             camera.flyTo({ zoom: 3.2, animate: false });
@@ -1147,6 +1154,46 @@ test('camera', (t) => {
             camera.flyTo(options);
         });
 
+        t.test('respects transform\'s maxZoom', (t) => {
+
+            const transform = new Transform(2, 10, false);
+            transform.resize(512, 512);
+
+            const camera = new Camera(transform, {});
+
+            camera.on('moveend', () => {
+                t.equalWithPrecision(camera.getZoom(), 10, 1e-10);
+                const { lng, lat } = camera.getCenter();
+                t.equalWithPrecision(lng, 12, 1e-10);
+                t.equalWithPrecision(lat, 34, 1e-10);
+
+                t.end();
+            });
+
+            const flyOptions = { center: [12, 34], zoom: 30};
+            camera.flyTo(flyOptions);
+        });
+
+        t.test('respects transform\'s minZoom', (t) => {
+
+            const transform = new Transform(2, 10, false);
+            transform.resize(512, 512);
+
+            const camera = new Camera(transform, {});
+
+            camera.on('moveend', () => {
+                t.equalWithPrecision(camera.getZoom(), 2, 1e-10);
+                const { lng, lat } = camera.getCenter();
+                t.equalWithPrecision(lng, 12, 1e-10);
+                t.equalWithPrecision(lat, 34, 1e-10);
+
+                t.end();
+            });
+
+            const flyOptions = { center: [12, 34], zoom: 1};
+            camera.flyTo(flyOptions);
+        });
+
         t.end();
     });
 
diff --git a/test/unit/ui/control/attribution.test.js b/test/unit/ui/control/attribution.test.js
index 41be18e9300..4dcb8940339 100644
--- a/test/unit/ui/control/attribution.test.js
+++ b/test/unit/ui/control/attribution.test.js
@@ -3,19 +3,25 @@
 const test = require('mapbox-gl-js-test').test;
 const window = require('../../../../src/util/window');
 const Map = require('../../../../src/ui/map');
+const config = require('../../../../src/util/config');
 const AttributionControl = require('../../../../src/ui/control/attribution_control');
 
 function createMap() {
     const container = window.document.createElement('div');
+    config.ACCESS_TOKEN = 'pk.123';
     return new Map({
         container: container,
         attributionControl: false,
         style: {
             version: 8,
             sources: {},
-            layers: []
-        }
+            layers: [],
+            owner: 'mapbox',
+            id: 'streets-v10',
+        },
+        hash: true
     });
+
 }
 
 test('AttributionControl appears in bottom-right by default', (t) => {
@@ -103,14 +109,13 @@ test('AttributionControl has the correct edit map link', (t) => {
     const map = createMap();
     const attribution = new AttributionControl();
     map.addControl(attribution);
-
     map.on('load', () => {
-        map.addSource('1', {type: 'vector', attribution: '<a class="mapboxgl-improve-map" href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>'});
+        map.addSource('1', {type: 'vector', attribution: '<a class="mapbox-improve-map" href="https://www.mapbox.com/feedback/" target="_blank">Improve this map</a>'});
         map.on('data', (e) => {
             if (e.dataType === 'source' && e.sourceDataType === 'metadata') {
-                t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/1', 'edit link contains map location data');
+                t.equal(attribution._editLink.href, 'https://www.mapbox.com/feedback/?owner=mapbox&id=streets-v10&access_token=pk.123#/0/0/0', 'edit link contains map location data');
                 map.setZoom(2);
-                t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/3', 'edit link updates on mapmove');
+                t.equal(attribution._editLink.href, 'https://www.mapbox.com/feedback/?owner=mapbox&id=streets-v10&access_token=pk.123#/0/0/2', 'edit link updates on mapmove');
                 t.end();
             }
         });
diff --git a/test/unit/ui/hash.test.js b/test/unit/ui/hash.test.js
index f568701977d..b4a521c271f 100644
--- a/test/unit/ui/hash.test.js
+++ b/test/unit/ui/hash.test.js
@@ -121,8 +121,8 @@ test('hash', (t) => {
 
         t.equal(newHash.length, 3);
         t.equal(newHash[0], '#3');
-        t.equal(newHash[1], '1.00');
-        t.equal(newHash[2], '2.00');
+        t.equal(newHash[1], '1');
+        t.equal(newHash[2], '2');
 
         map.setPitch(60);
 
@@ -130,8 +130,8 @@ test('hash', (t) => {
 
         t.equal(newHash.length, 5);
         t.equal(newHash[0], '#3');
-        t.equal(newHash[1], '1.00');
-        t.equal(newHash[2], '2.00');
+        t.equal(newHash[1], '1');
+        t.equal(newHash[2], '2');
         t.equal(newHash[3], '0');
         t.equal(newHash[4], '60');
 
@@ -141,8 +141,8 @@ test('hash', (t) => {
 
         t.equal(newHash.length, 5);
         t.equal(newHash[0], '#3');
-        t.equal(newHash[1], '1.00');
-        t.equal(newHash[2], '2.00');
+        t.equal(newHash[1], '1');
+        t.equal(newHash[2], '2');
         t.equal(newHash[3], '135');
         t.equal(newHash[4], '60');
 
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
index bcb0c641b68..50092deee7b 100755
--- a/test/unit/ui/map.test.js
+++ b/test/unit/ui/map.test.js
@@ -351,8 +351,8 @@ test('Map', (t) => {
             const map = createMap({style: style});
 
             map.on('load', () => {
-                map.on('error', (e) => {
-                    t.match(e.error.message, /There is no source with ID/);
+                map.on('error', ({ error }) => {
+                    t.match(error.message, /There is no source with ID/);
                     t.end();
                 });
                 map.isSourceLoaded('geojson');
@@ -964,8 +964,8 @@ test('Map', (t) => {
             });
 
             map.on('style.load', () => {
-                map.style.on('error', (e) => {
-                    t.match(e.error.message, /does not exist in the map\'s style and cannot be styled/);
+                map.style.on('error', ({ error }) => {
+                    t.match(error.message, /does not exist in the map\'s style and cannot be styled/);
                     t.end();
                 });
                 map.setLayoutProperty('non-existant', 'text-transform', 'lowercase');
@@ -1170,8 +1170,8 @@ test('Map', (t) => {
             });
 
             map.on('style.load', () => {
-                map.style.on('error', (e) => {
-                    t.match(e.error.message, /does not exist in the map\'s style and cannot be styled/);
+                map.style.on('error', ({ error }) => {
+                    t.match(error.message, /does not exist in the map\'s style and cannot be styled/);
                     t.end();
                 });
                 map.setPaintProperty('non-existant', 'background-color', 'red');
diff --git a/yarn.lock b/yarn.lock
index 3d819383777..bddcb4e63b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,6 +33,13 @@
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.0.0.tgz#c1de4293081424da3ac30c23afa850af1019bb54"
 
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 JSONStream@^1.0.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5"
@@ -189,6 +196,10 @@ array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
 
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
 array-index@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
@@ -288,6 +299,17 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+autoprefixer@^6.0.0:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -991,7 +1013,7 @@ bail@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.1.tgz#912579de8b391aadf3c5fdf4cd2a0fc225df3bc2"
 
-balanced-match@^0.4.1:
+balanced-match@^0.4.0, balanced-match@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -1237,6 +1259,13 @@ browserify@^14.0.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
 buble@^0.15.1:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/buble/-/buble-0.15.2.tgz#547fc47483f8e5e8176d82aa5ebccb183b02d613"
@@ -1322,14 +1351,29 @@ callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000665"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000665.tgz#e84f4277935f295f546f8533cb0b410a8415b972"
+
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -1438,6 +1482,13 @@ clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
 
+clone-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c"
+  dependencies:
+    is-regexp "^1.0.0"
+    is-supported-regexp-flag "^1.0.0"
+
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -1470,10 +1521,29 @@ collapse-white-space@^1.0.0, collapse-white-space@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.2.tgz#9c463fb9c6d190d2dcae21a356a01bcae9eeef6d"
 
+color-diff@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
+
 color-support@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.2.tgz#49cc99b89d1bdef1292e9d9323c66971a33eb89d"
 
+colorguard@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84"
+  dependencies:
+    chalk "^1.1.1"
+    color-diff "^0.1.3"
+    log-symbols "^1.0.2"
+    object-assign "^4.0.1"
+    pipetteur "^2.0.0"
+    plur "^2.0.0"
+    postcss "^5.0.4"
+    postcss-reporter "^1.2.1"
+    text-table "^0.2.0"
+    yargs "^1.2.6"
+
 colors@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -1581,6 +1651,18 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
 coveralls@^2.11.2, coveralls@^2.11.8:
   version "2.11.15"
   resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.15.tgz#37d3474369d66c14f33fa73a9d25cee6e099fca0"
@@ -1650,6 +1732,26 @@ crypto-browserify@^3.0.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
+css-color-names@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
+
+css-rule-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
+  dependencies:
+    css-tokenize "^1.0.1"
+    duplexer2 "0.0.2"
+    ldjson-stream "^1.2.1"
+    through2 "^0.6.3"
+
+css-tokenize@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^1.0.33"
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -1660,6 +1762,12 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
 d3-queue@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.3.tgz#10ee4dd0574a1affaabfb931d0ba4f117926edc6"
@@ -1694,7 +1802,7 @@ debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
+debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
@@ -1706,7 +1814,7 @@ debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-decamelize@^1.0.0, decamelize@^1.1.1:
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -1903,6 +2011,23 @@ documentation@4.0.0-beta12:
     vinyl-fs "^2.3.1"
     yargs "^6.0.0"
 
+doiuse@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
+  dependencies:
+    browserslist "^1.1.1"
+    caniuse-db "^1.0.30000187"
+    css-rule-stream "^1.1.0"
+    duplexer2 "0.0.2"
+    jsonfilter "^1.1.2"
+    ldjson-stream "^1.2.1"
+    lodash "^4.0.0"
+    multimatch "^2.0.0"
+    postcss "^5.0.8"
+    source-map "^0.4.2"
+    through2 "^0.6.3"
+    yargs "^3.5.4"
+
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -1935,18 +2060,18 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+duplexer2@0.0.2, duplexer2@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
+
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer2@~0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -1974,6 +2099,10 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+electron-to-chromium@^1.2.7:
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.9.tgz#db1cba2a26aebcca2f7f5b8b034554468609157d"
+
 elliptic@^6.0.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.2.tgz#e4c81e0829cf0a65ab70e998b8232723b5c1bc48"
@@ -2280,6 +2409,12 @@ evp_bytestokey@^1.0.0:
   dependencies:
     create-hash "^1.1.1"
 
+execall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
+  dependencies:
+    clone-regexp "^1.0.0"
+
 execspawn@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6"
@@ -2412,6 +2547,10 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
 flow-bin@^0.42.0:
   version "0.42.0"
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.42.0.tgz#05dd754b6b052de7b150f9210e2160746961e3cf"
@@ -2514,6 +2653,10 @@ function-loop@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/function-loop/-/function-loop-1.0.1.tgz#8076bb305e8e6a3cceee2920765f330d190f340c"
 
+gather-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
+
 gauge@~1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
@@ -2574,6 +2717,14 @@ get-comments@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-comments/-/get-comments-1.0.1.tgz#196759101bbbc4facf13060caaedd4870dee55be"
 
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stdin@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
 getpass@^0.1.1:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
@@ -2711,6 +2862,20 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+
 glsl-tokenizer@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/glsl-tokenizer/-/glsl-tokenizer-2.1.2.tgz#720307522e03c57af35c00551950c4a70ef2dfb9"
@@ -2873,6 +3038,10 @@ html-encoding-sniffer@^1.0.1:
   dependencies:
     whatwg-encoding "^1.0.1"
 
+html-tags@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e"
+
 html-void-elements@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.1.tgz#f929bea267a19e3535950502ca12c159f1b559af"
@@ -2938,6 +3107,16 @@ in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
 
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -3070,6 +3249,10 @@ is-decimal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.0.tgz#940579b6ea63c628080a69e62bda88c8470b4fe0"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
@@ -3175,6 +3358,10 @@ is-regex@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
 is-relative@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
@@ -3197,6 +3384,10 @@ is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-supported-regexp-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8"
+
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -3307,11 +3498,15 @@ jodid25519@^1.0.0:
   dependencies:
     jsbn "~0.1.0"
 
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@3.6.1, js-yaml@^3.2.7, js-yaml@^3.3.1, js-yaml@^3.5.1:
+js-yaml@3.6.1, js-yaml@^3.2.7, js-yaml@^3.3.1, js-yaml@^3.4.3, js-yaml@^3.5.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
@@ -3378,6 +3573,15 @@ json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+jsonfilter@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
+  dependencies:
+    JSONStream "^0.8.4"
+    minimist "^1.1.0"
+    stream-combiner "^0.2.1"
+    through2 "^0.6.3"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -3391,6 +3595,10 @@ jsonist@~1.3.0:
     json-stringify-safe "~5.0.0"
     xtend "~4.0.0"
 
+jsonparse@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
 jsonparse@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.0.tgz#85fc245b1d9259acc6941960b905adf64e7de0e8"
@@ -3421,6 +3629,10 @@ kind-of@^3.0.2:
   dependencies:
     is-buffer "^1.0.2"
 
+known-css-properties@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.7.tgz#9104343a2adfd8ef3b07bdee7a325e4d44ed9371"
+
 labeled-stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
@@ -3449,6 +3661,13 @@ lcov-parse@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
 
+ldjson-stream@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
+  dependencies:
+    split2 "^0.2.1"
+    through2 "^0.6.1"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -3532,7 +3751,7 @@ lodash.pickby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -3564,6 +3783,13 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
 lru-cache@^4.0.0, lru-cache@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -3581,6 +3807,10 @@ map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -3675,6 +3905,21 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
+meow@^3.3.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
 merge-descriptors@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -3930,7 +4175,7 @@ noop-logger@^0.1.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
   dependencies:
@@ -3943,6 +4188,14 @@ normalize-path@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
 
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+
 normalize-uri@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/normalize-uri/-/normalize-uri-1.1.0.tgz#01fb440c7fd059b9d9be8645aac14341efd059dd"
@@ -3984,6 +4237,10 @@ npm-run-all@^4.0.1:
     gauge "~2.7.1"
     set-blocking "~2.0.0"
 
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -4069,6 +4326,10 @@ once@~1.3.0, once@~1.3.3:
   dependencies:
     wrappy "1"
 
+onecolor@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
+
 onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -4315,6 +4576,13 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pipetteur@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
+  dependencies:
+    onecolor "^3.0.4"
+    synesthesia "^1.0.1"
+
 pixelmatch@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
@@ -4331,7 +4599,7 @@ platform@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz#646c77011899870b6a0903e75e997e8e51da7461"
 
-plur@^2.0.0:
+plur@^2.0.0, plur@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
   dependencies:
@@ -4349,6 +4617,65 @@ point-geometry@0.0.0, point-geometry@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/point-geometry/-/point-geometry-0.0.0.tgz#6fcbcad7a803b6418247dd6e49c2853c584daff7"
 
+postcss-less@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
+  dependencies:
+    postcss "^5.0.21"
+
+postcss-media-query-parser@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
+postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-reporter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+
+postcss-scss@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
+  dependencies:
+    postcss "^5.2.13"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-value-parser@^3.1.1, postcss-value-parser@^3.2.3:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss@^5.0.0, postcss@^5.0.18, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.4:
+  version "5.2.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
 prebuild@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-5.1.2.tgz#d2b59d2d9cc4dc8c646da4336d827d47f5b0f411"
@@ -4523,6 +4850,12 @@ rc@^1.0.3, rc@^1.1.0, rc@~1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~1.0.4"
 
+read-file-stdin@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
+  dependencies:
+    gather-stream "^1.0.0"
+
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -4561,6 +4894,15 @@ read-pkg@^2.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@^1.0.33, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
@@ -4573,15 +4915,6 @@ readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@~2.0.0, readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -4628,6 +4961,13 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
 regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
@@ -4838,6 +5178,10 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -5033,7 +5377,7 @@ source-map-support@^0.4.2, source-map-support@^0.4.3:
   dependencies:
     source-map "^0.5.3"
 
-"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3:
+"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -5043,7 +5387,7 @@ source-map@^0.1.34, source-map@~0.1.33:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.4.4:
+source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -5086,6 +5430,16 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
+specificity@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
+
+split2@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
+  dependencies:
+    through2 "~0.6.1"
+
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -5177,6 +5531,13 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
+stream-combiner@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  dependencies:
+    duplexer "~0.1.1"
+    through "~2.3.4"
+
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -5268,6 +5629,12 @@ strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
 strip-json-comments@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -5276,12 +5643,80 @@ strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
 
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+
+stylehacks@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
+  dependencies:
+    browserslist "^1.1.3"
+    chalk "^1.1.1"
+    log-symbols "^1.0.2"
+    minimist "^1.2.0"
+    plur "^2.1.2"
+    postcss "^5.0.18"
+    postcss-reporter "^1.3.3"
+    postcss-selector-parser "^2.0.0"
+    read-file-stdin "^0.2.1"
+    text-table "^0.2.0"
+    write-file-stdout "0.0.2"
+
+stylelint@^7.10.1:
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.10.1.tgz#209a7ce5e781fc2a62489fbb31ec0201ec675db2"
+  dependencies:
+    autoprefixer "^6.0.0"
+    balanced-match "^0.4.0"
+    chalk "^1.1.1"
+    colorguard "^1.2.0"
+    cosmiconfig "^2.1.1"
+    debug "^2.6.0"
+    doiuse "^2.4.1"
+    execall "^1.0.0"
+    file-entry-cache "^2.0.0"
+    get-stdin "^5.0.0"
+    globby "^6.0.0"
+    globjoin "^0.1.4"
+    html-tags "^1.1.1"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.0.7"
+    lodash "^4.17.4"
+    log-symbols "^1.0.2"
+    meow "^3.3.0"
+    micromatch "^2.3.11"
+    normalize-selector "^0.2.0"
+    postcss "^5.0.20"
+    postcss-less "^0.14.0"
+    postcss-media-query-parser "^0.2.0"
+    postcss-reporter "^3.0.0"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-scss "^0.4.0"
+    postcss-selector-parser "^2.1.1"
+    postcss-value-parser "^3.1.1"
+    resolve-from "^2.0.0"
+    specificity "^0.3.0"
+    string-width "^2.0.0"
+    style-search "^0.1.0"
+    stylehacks "^2.3.2"
+    sugarss "^0.2.0"
+    svg-tags "^1.0.0"
+    table "^4.0.1"
+
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
   dependencies:
     minimist "^1.1.0"
 
+sugarss@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+  dependencies:
+    postcss "^5.2.4"
+
 supercluster@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-2.2.0.tgz#e66c3c02ae2026da142e236b6d19827af0823c76"
@@ -5296,16 +5731,26 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.2:
+supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+
 symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
+synesthesia@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
+  dependencies:
+    css-color-names "0.0.3"
+
 syntax-error@^1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz#b4549706d386cc1c1dc7c2423f18579b6cade710"
@@ -5323,6 +5768,17 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
+table@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
 tap-mocha-reporter@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-3.0.3.tgz#e5917fad3d9a70957f9b7c736e793beb87d7daf1"
@@ -5431,7 +5887,7 @@ text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
-text-table@~0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -5442,7 +5898,7 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2@^0.6.0, through2@^0.6.3, through2@~0.6.3:
+through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1, through2@~0.6.3:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
   dependencies:
@@ -5541,6 +5997,10 @@ trim-lines@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.0.tgz#9926d03ede13ba18f7d42222631fb04c79ff26fe"
 
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
 trim-trailing-lines@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684"
@@ -5676,6 +6136,10 @@ unified@^5.0.0:
     vfile "^2.0.0"
     x-is-string "^0.1.0"
 
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
 unique-stream@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -5988,6 +6452,10 @@ write-file-atomic@^1.1.4:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
+write-file-stdout@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -6030,6 +6498,19 @@ yargs-parser@^4.0.2, yargs-parser@^4.2.0:
   dependencies:
     camelcase "^3.0.0"
 
+yargs@^1.2.6:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
+
+yargs@^3.5.4, yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
+
 yargs@^6.0.0, yargs@^6.5.0, yargs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
@@ -6047,12 +6528,3 @@ yargs@^6.0.0, yargs@^6.5.0, yargs@^6.6.0:
     which-module "^1.0.0"
     y18n "^3.2.1"
     yargs-parser "^4.2.0"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"