merge py3.7 into branch

--HG--
branch : release-pypy3.7-v7.x
2 jobs for release-pypy3.7-v7.3.6rc2 in 28 minutes and 40 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Test
passed check_rpython_annotations #251455

00:07:16

passed hpy_tests #251456

00:28:40