Merge remote-tracking branch 'kraxel/vnc.2' into staging