Adding OpenBSD support
Merging upstream changes