[todo] Update todo file (backports)
Merge pull request #42 from sbadia/update-todo

[todo] Update todo file (backports)