Merge from vendor branch BIND: