Merge branch 'jpeg_includes' of https://github.com/dcommander/tigervnc