Updated TODO list.
Merge branch 'master' into windows