Merge branch 'multisocket-rebased' of https://github.com/twaugh/tigervnc