Merge pull request #2901 from krytarowski/netbsd-support-3