Merge pull request #2164 from Ansuel/ddns_fix