Merge branch 'master' into python3

diff --cc CMakeLists.txt
index c3d1037265858e20e41ce533f8ae044235771b84,5b5ad604e1bdeb181b091ae55f9e04a1c0df50a3..385bbbd4d06d7bbb0321eab344b33d6c0509464f
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -69,9 -67,9 +67,6 @@@ set(CMAKE_KVIRC_BUILD_CPU ${CMAKE_SYSTE
  set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
  set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
  
- # Allow the use of the LOCATION property
- cmake_policy(SET CMP0026 OLD)
 -# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
 -set(Python_ADDITIONAL_VERSIONS "2.7")
--
  # Suffix for GNU/Linux
  set(LIB_SUFFIX
        CACHE STRING "Define suffix of directory name (32/64)"

diff --cc src/modules/pythoncore/kvircmodule.cpp
Simple merge