Merge branch 'VNC-Client-Branch'