make sure tl_todo has entries
Merge remote-tracking branch 'origin/master'