Fix setTimeout and setInterval names in stacktraces
Merge remote-tracking branch 'carter/master'