Merge branch 'master' into develop

diff --cc docs/CMakeLists.txt
Simple merge

diff --cc zzip/CMakeLists.txt
index 228cd8a1781fd9356c0b9b4b82a638c0baed7412,989e27dd5818cdd485579c933bd717ce1a612dc0..fb7287d414b9b94515cf650d6ebd2d64a78bce4c
--- 1/zzip/CMakeLists.txt
--- 2/zzip/CMakeLists.txt
+++ b/zzip/CMakeLists.txt
@@@ -1,6 -1,8 +1,8 @@@
  cmake_minimum_required (VERSION 3.1)
 -project(zziplib VERSION "0.13.69" LANGUAGES C)
 +project(zziplib VERSION "0.13.70" LANGUAGES C)
  
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts")
+ 
  # generate _config.h
  include ( CheckIncludeFiles )
  include ( CheckFunctionExists )

diff --cc zzipwrap/CMakeLists.txt
index ebd56d630eef1d9214efd36dabf4920aedc88f1f,d9cd1b87b8279b9c161c0fae68bb7438c3b2dd5d..7e8225e66f71c554426fc0398d6de60b30389fbc
--- 1/zzipwrap/CMakeLists.txt
--- 2/zzipwrap/CMakeLists.txt
+++ b/zzipwrap/CMakeLists.txt
@@@ -1,6 -1,8 +1,8 @@@
  cmake_minimum_required (VERSION 3.1)
 -project(zzipwrap VERSION "0.13.69" LANGUAGES C)
 +project(zzipwrap VERSION "0.13.70" LANGUAGES C)
  
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts")
+ 
  include ( CheckIncludeFiles )
  include ( GNUInstallDirs )
  include ( FindPkgConfig )