Merge pull request #2907 from krytarowski/netbsd-support-7