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