Merge branch 'port-2021-06-28' into 'master'

Port 2021 06 28

See merge request p2p/go-addr-util!1
2 jobs for master in 1 minute and 29 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #1340
testing
build

00:01:16

 
  Test
passed #1341
testing
test

00:00:12

91.5%