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