Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns