Allow slower DNS response.
Remove duplicate updates.
Merge branch 'refs/heads/master' into 2.3.x-dev