Merge pull request #3381 from krytarowski/netbsd-support-20