merge heads

--HG--
branch : py3.7
2 jobs for branch/py3.7 in 7 minutes and 15 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #194680
check_rpython_annotations

00:07:15

passed #194681
hpy_tests

00:06:38