Merge remote-tracking branch 'refs/remotes/origin/development'

modules/PointForceControllerToy/1/main.cs

@@ -90,6 +90,8 @@ function PointForceControllerToy::reset( %this )
     // Start a timer throwing asteroids.
     if ( PointForceControllerToy.autoSpawnAsteroids )
         %this.startTimer( "createAsteroid", 1000 );
+    else
+        %this.stopTimer();        
 }
 
 //-----------------------------------------------------------------------------