Merge branch 'master' into fuzz-pipe

Conflicts:
	bin/package.json

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/build-shaders.js b/bin/build-shaders.js
index 38aa753730..329f8063f7 100755
--- a/bin/build-shaders.js
+++ b/bin/build-shaders.js
@@ -5,7 +5,7 @@ var fs = require('fs');
 var path = require('path');
 var mkdirp = require('mkdirp');
 
-try { var glsl = require('glsl-optimizer'); } catch(err) {}
+try { var glsl = require('mapbox-glsl-optimizer'); } catch(err) {}
 
 module.exports = function(shader_type, prefix, suffix) {
     var name;