Merge branch 'V5-6-patches' into V5-7-patches

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