Merge "Sync upstream-openbsd."