merge default into testsuite-fixes

--HG--
branch : testsuite-fixes
1 job for branch/testsuite-fixes in 7 minutes and 14 seconds (queued for 5 seconds)
latest
Status Name Job ID Coverage
  Test
passed check_rpython_annotations #144344

00:07:14