Switched to using d3.timer.
Merge branch 'master' into gh-pages