Merge pull request #1035 from TheBlueMatt/2021-08-faster-pings