Merge branch 'wip/lantw/freebsd-kqueue-complex' into 'master'