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