PPQ#25 Jim Franklin can't be a judge
Merge remote-tracking branch 'upstream/master' into force_flag