use the current unix-socket-factory
Merge remote-tracking branch 'origin/master'