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