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