Merge branch 'master' into develop

diff --cc zzip/CMakeLists.txt
index 07960ea8e94ee7449370d17c69ae33d7d594fcb6,3f55456d4dc590de194f02209d561464aa5a3b26..f03e130d0be23389ccec96be5a4e2ee54d7f5d60
--- 1/zzip/CMakeLists.txt
--- 2/zzip/CMakeLists.txt
+++ b/zzip/CMakeLists.txt
@@@ -35,7 -33,7 +35,7 @@@ set(ZZIP_VERSION "${PROJECT_VERSION}"
  set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
  set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
  
- if(ZZIP_COMPAT)
 -if(ZZIPCOMPAT OR ZZIP_PKGCONFIG)
++if(ZZIP_COMPAT OR ZZIP_PKGCONFIG)
  find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
  endif()
  

diff --cc zzipwrap/CMakeLists.txt
Simple merge