Merge branch 'upstream' into blanks
Bugfix: assign unique (negative) ids to blank cards; previously the wrong card could win if multiple blanks were being judged in the same round.
Merge branch 'blanks'