Merge OpenBSD -current.