Merge branch '5.x' into master

Resolved merge conflicts:
    sphinx/ext/extlinks.py
    sphinx/ext/napoleon/docstring.py
    (and removed from the latter a now unused import for flake8 F401
    compliance)

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index b9e048d07..790d4d725 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@ extras_require = {
     ],
     'lint': [
         'flake8>=3.5.0',
+        'flake8-comprehensions',
         'isort',
         'mypy>=0.950',
         'sphinx-lint',