count the votes
Merge branch 'master' into stats