Merge pull request #4380 from Ansuel/ddns-fix-pt2