References: <rt-4.4.1-46398-1509009450-1277.0-0-0@isc.org>
 <RT-Ticket-46407@isc.org>
Content-Transfer-Encoding: binary
Message-ID: <rt-4.4.1-68750-1509144711-696.46407-0-0@isc.org>
MIME-Version: 1.0
Content-Disposition: inline
X-RT-Interface: Web
X-Mailer: MIME-tools 5.508 (Entity 5.508)
In-Reply-To: <rt-4.4.1-46398-1509009450-1277.0-0-0@isc.org>
Content-Type: text/plain; charset="utf-8"
X-RT-Original-Encoding: utf-8
RT-Send-CC:
Content-Length: 147

This looks fine, okay to merge.

While backporting it, you might want to see whether any of the unit tests
from 46267 should be backported as well.