Fix stats bug
Merge branch 'feature/DueDate'
Merge branch release/0.8 (stats fix)