Merge pull request #3291 from rs/feature_nextdns