Merge NetBSD -current.