fix pygame
Merge branch 'experimental/plover' into refs/top-bases/experimental/marc

* experimental/plover:
  fix pygame
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix pygame