merge default into release

--HG--
branch : release-pypy2.7-v7.x
1 job for release-pypy2.7-v7.3.6rc1 in 5 minutes and 10 seconds (queued for 3 seconds)
latest
Status Name Job ID Coverage
  Test
passed check_rpython_annotations #245597

00:05:10