From 6728bb6430a854a1ee338960376bffb8b1924516 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Thu, 29 Sep 2016 09:26:58 +0200
Subject: [PATCH 1/2] show webview when caret testing

fixes #1988
---
 tests/unit/javascript/position_caret/test_position_caret.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py
index ca5d75d2e..2691c1afe 100644
--- a/tests/unit/javascript/position_caret/test_position_caret.py
+++ b/tests/unit/javascript/position_caret/test_position_caret.py
@@ -67,7 +67,11 @@ class CaretTester:
 @pytest.fixture
 def caret_tester(js_tester):
     """Helper fixture to test caret browsing positions."""
-    return CaretTester(js_tester)
+    caret_tester = CaretTester(js_tester)
+    # Showing webview here is necessary for test_scrolled_down_img to
+    # succeed in some cases, see #1988
+    caret_tester.js.webview.show()
+    return caret_tester
 
 
 @pytest.mark.integration

From 8c70e1529c78971248fd91f4b743198a45e3a993 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 29 Sep 2016 10:59:21 +0200
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 13a2db102..c5bd05161 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -168,13 +168,13 @@ Contributors, sorted by the number of commits in descending order:
 * Austin Anderson
 * Jimmy
 * Niklas Haas
+* Daniel Karbach
 * Alexey "Averrin" Nabrodov
 * nanjekyejoannah
 * avk
 * ZDarian
 * Milan Svoboda
 * John ShaggyTwoDope Jenkins
-* Daniel Karbach
 * Clayton Craft
 * Peter Vilim
 * knaggita