Fix minor 'No deck' voting issue
Merge remote-tracking branch 'origin/dev-fix-more-bugs' into dev