Merge branch 'vncserverfix' of https://github.com/michalsrb/tigervnc