Update TODO.
Remove mistakenly added testing line.
Merge branch 'master' into gh-pages