merge default into release

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

00:07:30