Merge remote-tracking branch 'origin/dev' into dev

examples/js/controls/OrbitControls.js

@@ -256,7 +256,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 
 		phi = Math.atan2( Math.sqrt( offset.x * offset.x + offset.z * offset.z ), offset.y );
 
-		if ( this.autoRotate ) {
+		if ( this.autoRotate && state === STATE.NONE ) {
 
 			this.rotateLeft( getAutoRotationAngle() );