reyk Merge branch 'reyk/openbsd'