Correct path for todo config.
Merge branches 'master' and 'develop'