Merge remote-tracking branch 'remotes/mrdoob/dev' into dev

examples/canvas_geometry_text.html

@@ -31,7 +31,7 @@
 
 			var camera, scene, renderer;
 
-			var text, plane;
+			var text, parent;
 
 			var targetRotation = 0;
 			var targetRotationOnMouseDown = 0;