Merge trunk into branch "unix-sockets"