Merge branch 'develop' into testing

Author: starwed

tests/time.js

@@ -155,7 +155,7 @@
 
       ok(endTime > startTime, "After " + framesTriggered + " frames triggered, EndTime " + endTime + " must be larger than StartTime " + startTime);
       start();
-    }, 100);
+    }, 200);
     stop(); // pause the QUnit so the timeout has time to complete.
   });