Merge from vendor branch NETBSD: