Merge branch 'trunk' into py-xwayland-firefox-tests

Author: cgoldberg

py/conftest.py

@@ -163,7 +163,7 @@ def fin():
             options = get_options(driver_class, request.config)
         if driver_class == "WebKitGTK":
             options = get_options(driver_class, request.config)
-        if driver_class.lower() == "WPEWebKit":
+        if driver_class == "WPEWebKit":
             options = get_options(driver_class, request.config)
         if driver_class == "Remote":
             options = get_options("Firefox", request.config) or webdriver.FirefoxOptions()