Merge branch 'socket' of https://github.com/CendioOssman/tigervnc