Merge branch 'master' into 3.16_stable

* master:
  Prepare for 3.16.1 release
  Move persistent client require to where it's used
  Fix missing constant when using :selenium_chrome

lib/capybara.rb

@@ -544,6 +544,7 @@ module Selenium; end
 end
 
 Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.load_selenium
   browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
     opts.args << '--disable-site-isolation-trials'

lib/capybara/selenium/driver.rb

@@ -16,7 +16,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def self.load_selenium
     require 'selenium-webdriver'
-    require 'capybara/selenium/patches/persistent_client'
     warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade." if Gem.loaded_specs['selenium-webdriver'].version < Gem::Version.new('3.5.0')
   rescue LoadError => err
     raise err if err.message !~ /selenium-webdriver/
@@ -27,6 +26,7 @@ def self.load_selenium
   def browser
     @browser ||= begin
       options[:http_client] ||= begin
+        require 'capybara/selenium/patches/persistent_client'
         if options[:timeout]
           ::Capybara::Selenium::PersistentClient.new(read_timeout: options[:timeout])
         else

lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.16.0'
+  VERSION = '3.16.1'
 end