hg merge default

--HG--
branch : assert-rewrite
1 job for branch/assert-rewrite in 7 minutes and 11 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #86847
check_rpython_annotations

00:07:11