Merge branch 'master' into dev

diff --cc CMakeLists.txt
Simple merge

diff --cc cmakescripts/GNUInstallDirs.cmake
index ec1f9badad996fb1109dcaecbf8082a504d84c59,7c41196591245908c1cd33c86702b8e4351a4632..6408fca77712a5ba649f5d601e130af24e8ea721
--- 1/cmakescripts/GNUInstallDirs.cmake
--- 2/cmakescripts/GNUInstallDirs.cmake
+++ b/cmakescripts/GNUInstallDirs.cmake
@@@ -118,8 -118,7 +118,8 @@@
  #   absolute paths where necessary, using the same logic.
  
  #=============================================================================
- # Copyright 2016 D. R. Commander
 +# Copyright 2018 Matthias Räncker
+ # Copyright 2016, 2019 D. R. Commander
  # Copyright 2016 Dmitry Marakasov
  # Copyright 2016 Roger Leigh
  # Copyright 2015 Alex Turbov