Make vote tallying a bit more tolerant of error
Merge remote-tracking branch 'origin/master'