Merge branch 'recursive-todo-stats'