Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160719-1' into staging