Merge pull request #2779 from hwti/statistics-ping-addressfamily