Merge pull request #808 from landryb/openbsd_build_fixes_2