Clarified that Unix sockets are also supported
auto-merge staging into master