merged to latest timeline.js