Merge pull request #4157 from Ansuel/fixddns