Merge branch 'vendor/LDNS'