Made darwin support extend to freebsd.
Merge branch 'master' into addfreebsd