Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/runtime.js b/js/helper-classes/RDGE/src/core/script/runtime.js
index 8d8fdf38..18b9b223 100644
--- a/js/helper-classes/RDGE/src/core/script/runtime.js
+++ b/js/helper-classes/RDGE/src/core/script/runtime.js
@@ -179,7 +179,7 @@ RDGERequestAnimationFrame = (function() {
 RDGETask = (function() {

     var tasks = {};

     return function(canvas, startNow) {

-        this.id = canvas.id;

+        this.id = canvas.rdgeid;

         this.currTime = 0.0;

         this.lastTime = 0.0;

         this.running = false;