last known good config
fix fd_set for linux
Merge branch 'rebased' into dev
Merge branch 'dev'