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