Merge "Sync with upstream OpenBSD."