From 60c2b9c0b20a051cddf0cdd3bf0e40603dfe6bb9 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Mon, 15 Feb 2016 21:59:09 +0100
Subject: [PATCH 1/2] fixes #1308

---
 tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 6b9c1feca..2bfa30603 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -425,7 +425,7 @@ def pytest_configure(config):
         try:
             disp = xvfbwrapper.Xvfb(width=800, height=600, colordepth=16)
             disp.start()
-        except FileNotFoundError:
+        except EnvironmentError:
             # We run without Xvfb if it's unavailable.
             pass
         else:

From 9a18bc4cedec7b33626dcf75faf862caab22f087 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Feb 2016 22:08:42 +0100
Subject: [PATCH 2/2] Regenerate authors.

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.asciidoc b/README.asciidoc
index 3d7c4a276..a4632f27e 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -148,8 +148,8 @@ Contributors, sorted by the number of commits in descending order:
 * Alexander Cogneau
 * Martin Tournoij
 * Raphael Pierzina
-* Joel Torstensson
 * Felix Van der Jeugt
+* Joel Torstensson
 * Claude
 * Patric Schmitz
 * meles5