Merge pull request #1759 from pmelange/feature_remove_nameserver_213_73_91_35