Sync with OpenBSD