Manual merge of a fix that closes a loophole in the voting system.