Auto merge of #4749 - flip1995:backport_merge, r=Manishearth

Merge backport branches back into master

r? @Manishearth

cc #4745

changelog: none
This commit is contained in:
bors 2019-10-28 17:12:24 +00:00
commit c8e3cfbdd9

Diff content is not available