Sync with OpenBSD
Sync with OpenBSD