Comment 1 for bug 1471161

Attached a patch providing an initial candidate fix, based off master.

Tests are passing, but this has not yet been validated with BIND/PowerDNS etc