Merge branch '1.8'

CHANGES

@@ -213,6 +213,7 @@ Bugs fixed
 * #5928: KeyError: 'DOCUTILSCONFIG' when running build
 * #5936: LaTeX: PDF build broken by inclusion of image taller than page height
   in an admonition
+* #5231: "make html" does not read and build "po" files in "locale" dir
 
 Testing
 --------

sphinx/util/matching.py

@@ -10,6 +10,8 @@
 
 import re
 
+from sphinx.util.osutil import canon_path
+
 if False:
     # For type annotation
     from typing import Callable, Dict, List, Match, Pattern  # NOQA
@@ -85,6 +87,7 @@ class Matcher:
 
     def match(self, string):
         # type: (str) -> bool
+        string = canon_path(string)
         return any(pat(string) for pat in self.patterns)