Fix logic error in vote detection.
Merge branch '2.1.2'