Add todos/remaining.json support and test
Merge branch 'master' into master-2