Merge pull request #779 from landryb/openbsd_build_fixes