Merge pull request #910 from TheBlueMatt/2021-05-sort-addrs