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