Fix one duplication of code and docs for stats
Merge branch 'master' into gh-pages
Update docs