Merge branch 'rs/obsd-getcwd-workaround' into maint