update TODO
Merge remote-tracking branch 'upstream/master' into update-todo

Conflicts:
	TODO
Merge pull request #353 from koeppea/update-todo

update TODO