Merge pull request #6449 from mikeller/f3_juggling_next_round