Merge remote-tracking branch 'origin/master' into nova-vncproxy-redux