Merge pull request #2903 from krytarowski/netbsd-support-4