Merge proposals dependent on lp://qastaging/~rschroll/euchre/refactor

lp://qastaging/~rschroll/euchre/refactor has no merge proposals.