Merge branch 'jc/maint-obsd46' into maint