Redirect xvfb and xdpy output to logs
Merge remote-tracking branch 'upstream/master'