Merge pull request #17458 from BKPepe/dnspython-2.1.0