Add missing file
Merge remote-tracking branch 'upstream/master'
Using fsock instead of sockets, fixing timeout for pb queries