Merge branch 'master' into dev

utils/build/includes/canvas.json

@@ -16,11 +16,11 @@
 	"src/math/Frustum.js",
 	"src/math/Math.js",
 	"src/math/Triangle.js",
+	"src/core/Layers.js",
 	"src/core/EventDispatcher.js",
 	"src/core/Raycaster.js",
 	"src/core/Object3D.js",
 	"src/core/Face3.js",
-	"src/core/Face4.js",
 	"src/core/BufferAttribute.js",
 	"src/core/Geometry.js",
 	"src/core/BufferGeometry.js",