Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  logmatch: fix out-of-bounds access. Thanks to gcc or clang with -fsanitize=address (recommended!)