Fix issue with adding multiple timers in js land
Merge remote-tracking branch 'upstream/master'