scheduler + js test stuff
Merge remote-tracking branch 'origin/trunk' into trunk