merge default into py3.6

--HG--
branch : py3.6
1 job for topic/py3.6/embedded-in-virtualenv in 6 minutes and 27 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Test
passed check_rpython_annotations #80576

00:06:27